abai 13 órája
szülő
commit
2c537939bd

+ 2 - 1
ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/IBjNotifyModelConfigService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.business.service;
 
+import com.ruoyi.business.domain.BjNotifyModelConfig;
 import com.ruoyi.business.domain.bo.BjNotifyModelConfigBo;
 import com.ruoyi.business.domain.vo.BjNotifyModelConfigVo;
 
@@ -56,5 +57,5 @@ public interface IBjNotifyModelConfigService {
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
-    BjNotifyModelConfigVo queryByModelName(BjNotifyModelConfigBo bo);
+    List<BjNotifyModelConfig> queryByModelName(BjNotifyModelConfigBo bo);
 }

+ 4 - 3
ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjNotifyModelConfigServiceImpl.java

@@ -13,6 +13,7 @@ import com.ruoyi.business.service.IBjNotifyModelConfigService;
 import com.ruoyi.common.core.exception.ServiceException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.Lists;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -117,7 +118,7 @@ public class BjNotifyModelConfigServiceImpl implements IBjNotifyModelConfigServi
     }
 
     @Override
-    public BjNotifyModelConfigVo queryByModelName(BjNotifyModelConfigBo bo) {
+    public List<BjNotifyModelConfig> queryByModelName(BjNotifyModelConfigBo bo) {
         if (StringUtils.isBlank(bo.getModelName()) && StringUtils.isBlank(bo.getModelChildrenName())) {
             throw new ServiceException("模型名称和模型子名称不能为空");
         }
@@ -126,9 +127,9 @@ public class BjNotifyModelConfigServiceImpl implements IBjNotifyModelConfigServi
                 .eq(BjNotifyModelConfig::getModelChildrenName, bo.getModelChildrenName())
                 .orderByAsc(BjNotifyModelConfig::getCreateTime));
         if (CollectionUtils.isNotEmpty(notifyModelConfigList)) {
-            return BeanUtil.copyProperties(notifyModelConfigList.get(0), BjNotifyModelConfigVo.class);
+            return notifyModelConfigList;
         }
-        return new BjNotifyModelConfigVo();
+        return Lists.newArrayList();
     }
 
 }