Merge branch 'dev-merge-pre-secrity-kdhc' of http://192.168.1.43:3000/v2/zd-parents into dev-merge-pre-secrity-kdhc

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabSubject.java

@@ -108,7 +108,8 @@ public class LabSubject extends BaseEntity implements QCInterface {
     @ApiModelProperty("楼栋ID")
     private Long buildId;
 
-
+    @ApiModelProperty("楼栋名称")
+    private String buildName;
     @ApiModelProperty("布局ID")
     private Long layoutId;
 

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSubjectMapper.xml

@@ -1451,8 +1451,9 @@
      </select>
     <select id="buildBySub" resultType="com.zd.laboratory.domain.LabSubject">
 
-        select s.id,s.name,s.dept_id deptId,dt.`dept_name` deptName,s.build_id buildId,s.room from lab_subject s
+        select s.id,s.name,s.dept_id deptId,dt.`dept_name` deptName,s.build_id buildId,lbf.name buildName, s.room from lab_subject s
         INNER JOIN sys_dept dt ON s.`dept_id` = dt.dept_id
+        INNER JOIN lab_build_floor lbf ON s.build_id = lbf.id
         <where>
             <if test="buildId != null ">and s.build_id = #{buildId}</if>
             <if test="searchValue != null and searchValue !=''">

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)) {

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("实验室列表数据为空！");