安全准入审核，变更实验室负责人时无审核数据的问题

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSecurityApplyController.java

@@ -78,6 +78,9 @@ public class LabSecurityApplyController extends BaseController
     @Autowired
     private FileConfigUtils fileConfigUtils;
 
+    @Autowired
+    private ILabSubjectService labSubjectService;
+
     /**
      * 查询安全准入申请列表
      */
@@ -94,7 +97,16 @@ public class LabSecurityApplyController extends BaseController
             labSecurityApplyVO.setDeptId(sysUser.getDeptId());
         }else if("11".equals(sysUser.getUserType())){
             //教职工登录，实验室负责人为当前用户的数据
-            labSecurityApplyVO.setSubjectAdminid(sysUser.getUserId());
+            //labSecurityApplyVO.setSubjectAdminid(sysUser.getUserId());
+
+            List<Long> ids = new ArrayList<>();
+            LabSubject labSubject = new LabSubject();
+            labSubject.setAdminId(sysUser.getUserId());
+            List<LabSubject> list = labSubjectService.selectLabSubjectListByadminidNotnull(labSubject);
+            for (LabSubject sub:list) {
+                ids.add(sub.getId());
+            }
+            labSecurityApplyVO.setSubjectIds(ids);
         }else if(UserConstants.USER_TYPE_STUDENT.equals(sysUser.getUserType())){
             //labSecurityApply.setUserId(sysUser.getUserId());// 学生登录(学生无审核权限)，申请人id 为当前用户id的数据
             return getDataTable(new ArrayList());
@@ -158,9 +170,20 @@ public class LabSecurityApplyController extends BaseController
         if("00".equals(sysUser.getUserType())){
             labSecurityApplyVO.setDeptId(sysUser.getDeptId());// 系统用户按部门查询
         }else if("11".equals(sysUser.getUserType())){
-            labSecurityApplyVO.setSubjectAdminid(sysUser.getUserId());// 教职工登录，实验室负责人为当前用户的数据
+            // 教职工登录，实验室负责人为当前用户的数据
+            //labSecurityApplyVO.setSubjectAdminid(sysUser.getUserId());
+
+            List<Long> ids = new ArrayList<>();
+            LabSubject labSubject = new LabSubject();
+            labSubject.setAdminId(sysUser.getUserId());
+            List<LabSubject> list = labSubjectService.selectLabSubjectListByadminidNotnull(labSubject);
+            for (LabSubject sub:list) {
+                ids.add(sub.getId());
+            }
+            labSecurityApplyVO.setSubjectIds(ids);
         }else if(UserConstants.USER_TYPE_STUDENT.equals(sysUser.getUserType())){
-            //labSecurityApply.setUserId(sysUser.getUserId());// 学生登录(学生无审核权限)，申请人id 为当前用户id的数据
+            // 学生登录(学生无审核权限)，申请人id 为当前用户id的数据
+            labSecurityApplyVO.setUserId(sysUser.getUserId());
         }
         List<LabSecurityApplyVO> list = labSecurityApplyService.selectLabSecurityApplyList(labSecurityApplyVO);
         List<LabSecurityApplyExcelVO> excelList = new ArrayList<>();
@@ -552,8 +575,17 @@ public class LabSecurityApplyController extends BaseController
             //系统用户登录
             labSecurityApplyVO.setDeptId(sysUser.getDeptId());
         }else if("11".equals(sysUser.getUserType())){
-            //教职工登录
-            labSecurityApplyVO.setSubjectAdminid(sysUser.getUserId());
+            //教职工登录，该人员负责的实验室
+            //labSecurityApplyVO.setSubjectAdminid(sysUser.getUserId());
+
+            List<Long> ids = new ArrayList<>();
+            LabSubject labSubject = new LabSubject();
+            labSubject.setAdminId(sysUser.getUserId());
+            List<LabSubject> list = labSubjectService.selectLabSubjectListByadminidNotnull(labSubject);
+            for (LabSubject sub:list) {
+                ids.add(sub.getId());
+            }
+            labSecurityApplyVO.setSubjectIds(ids);
         }else if(UserConstants.USER_TYPE_STUDENT.equals(sysUser.getUserType())){
             //学生登录
             labSecurityApplyVO.setUserId(sysUser.getUserId());

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabSecurityApplyVO.java

@@ -46,6 +46,8 @@ public class LabSecurityApplyVO extends LabSecurityApply {
 
     private String fileList;
 
+    private List<Long> subjectIds;//实验室id集合
+
     public String getLaboratoryDeptName() {        return laboratoryDeptName;    }
 
     public void setLaboratoryDeptName(String laboratoryDeptName) {        this.laboratoryDeptName = laboratoryDeptName;    }
@@ -116,4 +118,8 @@ public class LabSecurityApplyVO extends LabSecurityApply {
     public void setFileList(String fileList) {
         this.fileList = fileList;
     }
+
+    public List<Long> getSubjectIds() {        return subjectIds;    }
+
+    public void setSubjectIds(List<Long> subjectIds) {        this.subjectIds = subjectIds;    }
 }

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

@@ -123,6 +123,12 @@
             <if test="validLength != null "> and valid_length = #{validLength}</if>
             <if test="validBeginTime != null "> and valid_begin_time = #{validBeginTime}</if>
             <if test="validEndTime != null "> and valid_end_time = #{validEndTime}</if>
+            <if test="subjectIds!=null and subjectIds.size > 0">
+                and subject_id in
+                <foreach item="subject_id" collection="subjectIds" separator="," open="(" close=")">
+                    #{subject_id}
+                </foreach>
+            </if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
@@ -165,6 +171,12 @@
             <if test="validBeginTime != null "> and valid_begin_time = #{validBeginTime}</if>
             <if test="validEndTime != null "> and valid_end_time = #{validEndTime}</if>
             <if test="remark != null and remark != ''"> and audit_status in (0,1)</if>
+            <if test="subjectIds!=null and subjectIds.size > 0">
+                and subject_id in
+                <foreach item="subject_id" collection="subjectIds" separator="," open="(" close=")">
+                    #{subject_id}
+                </foreach>
+            </if>
             <!-- 数据范围过滤 ${params.dataScope}-->
 
         </where>
@@ -332,6 +344,12 @@
         <if test="subjectAdminid != null "> and subject_adminid = #{subjectAdminid}</if>
         <if test="auditStatus != null "> and audit_status = #{auditStatus}</if>
         <if test="userId != null "> and user_id = #{userId}</if>
+        <if test="subjectIds!=null and subjectIds.size > 0">
+            and subject_id in
+            <foreach item="subject_id" collection="subjectIds" separator="," open="(" close=")">
+                #{subject_id}
+            </foreach>
+        </if>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
         GROUP BY DATE_FORMAT(creat_time,'%Y-%m-%d')