hanzhiwei 1 год назад
Родитель
Сommit
388d97ea1e

+ 1 - 1
zd-modules/zd-security/src/main/java/com/zd/security/controller/CheckManageController.java

@@ -89,7 +89,7 @@ public class CheckManageController extends AbstractController {
     public ResultData add(@RequestBody CheckManageBo checkManageBo) {
         //参数检查
         paramCheck.notNull(checkManageBo).strNotEmpty(checkManageBo.getTitle()).notNull(checkManageBo.getCheckType())
-                .notNull(checkManageBo.getCycleStartTime()).notNull(checkManageBo.getCycleEndTime());
+                .notNull(checkManageBo.getCycleStartTime()).notNull(checkManageBo.getCycleEndTime()).strNotEmpty(checkManageBo.getSubIds());
         checkManageBo.setLoginUserName(getCurrentUserName());
         checkManageBo.setLoginUserId(getCurrentUserId());
         if (checkManageService.addcheckManage(checkManageBo)) {

+ 5 - 0
zd-modules/zd-security/src/main/java/com/zd/security/service/impl/CheckPlanServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zd.common.core.utils.StringUtils;
 import com.zd.laboratory.api.dto.CheckSubjectDto;
 import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import com.zd.model.constant.HttpStatus;
@@ -74,6 +75,10 @@ public class CheckPlanServiceImpl extends ServiceImpl<CheckPlanMapper, CheckPlan
         checkPlan.setCheckStatus(checkPlan.getCheckStatus() != null ? checkPlan.getCheckStatus() : 1);
         checkPlan.setIsDeleted(Boolean.FALSE);
         String subIds = getSubIds(checkPlanBo);
+        if (StringUtils.isBlank(subIds)){
+            log.info("实验室id为空!");
+            return Boolean.FALSE;
+        }
         ResultData<List<CheckSubjectDto>> resultData = remoteLaboratoryService.findSubjectInfoList(subIds);
         if (resultData.getCode() != HttpStatus.SUCCESS) {
             log.info("实验室列表数据为空!");