2023-11-10 删除注释，修改优化代码。

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabMessageUserServiceImpl.java

@@ -22,7 +22,7 @@ import com.zd.system.api.feign.RemoteUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -152,7 +152,7 @@ public class LabMessageUserServiceImpl implements ILabMessageUserService {
     {
         LoginUser loginUser = tokenService.getLoginUser();
         if(loginUser ==null ) {
-            return null;
+            return new ArrayList <>();
         }
        return labMessageUserMapper.queryLiteMessageNoticeVO(loginUser.getUserid(),loginUser.getSysUser().getDeptId());
     }
@@ -182,50 +182,6 @@ public class LabMessageUserServiceImpl implements ILabMessageUserService {
                 labMessageUserMapper.updateLabMessageUser(labMessageUserNew);
             }
         }
-//        //查询安全准入相关信息
-//        LabSecurityApplyVO labSecurityApplyVO = labSecurityApplyMapper.selectLabSecurityApplyById(labMessageDynamic.getDynamicId());
-//        ResultData <SysUser> rDate =remoteUserService.getUserInfoByUserId(labSecurityApplyVO.getUserId(), SecurityConstants.INNER);
-//        SysUser sysUser = rDate.getData();
-//        labSecurityApplyVO.setSysUser(sysUser);
-//
-//        List<LabSecurityMaterialDataVO> listTemp=Collections.emptyList();//模板
-//        //学生登录
-//        if("22".equals(sysUser.getUserType())){
-//            //模板查询
-////            listModel =labSecurityMaterialDataMapper.selectLabSecurityMaterialDataStudent(labSecurityApplyVO.getSubjectId());
-//            //模板查询
-//            listTemp =labSecurityMaterialDataMapper.selectLabSecurityMaterialDataStudent(labSecurityApplyVO.getSubjectId());
-//            for (int i=0;i<listTemp.size();i++){
-//                //如果是关联模板 查询出具体关联的内容
-//                if(1==listTemp.get(i).getMaterialType()){
-//                    //上传材料查询
-//                    LabSecurityMaterialrelation lmr = new LabSecurityMaterialrelation();
-//                    lmr.setApplyId(labSecurityApplyVO.getId());
-//                    lmr.setMaterialId(listTemp.get(i).getId());
-//                    List<LabSecurityMaterialrelation>  list =labSecurityMaterialrelationMapper.selectLabSecurityMaterialrelationList(lmr);
-//                    listTemp.get(i).setListMr(list);
-//                }
-//            }
-//            map.put("listModel",listTemp);//模板
-//        }else if("11".equals(sysUser.getUserType())){
-//            //教职工 模板查询
-////            listModel= labSecurityMaterialDataMapper.selectLabSecurityMaterialDataTeacher(labSecurityApplyVO.getSubjectId());
-//            //教职工 模板查询
-//            listTemp= labSecurityMaterialDataMapper.selectLabSecurityMaterialDataTeacher(labSecurityApplyVO.getSubjectId());
-//            for (int i=0;i<listTemp.size();i++){
-//                //如果是关联模板 查询出具体关联的内容
-//                if(1==listTemp.get(i).getMaterialType()){
-//                    //上传材料查询
-//                    LabSecurityMaterialrelation lmr = new LabSecurityMaterialrelation();
-//                    lmr.setApplyId(labSecurityApplyVO.getId());
-//                    lmr.setMaterialId(listTemp.get(i).getId());
-//                    List<LabSecurityMaterialrelation>  list =labSecurityMaterialrelationMapper.selectLabSecurityMaterialrelationList(lmr);
-//                    listTemp.get(i).setListMr(list);
-//                }
-//            }
-//            map.put("listModel",listTemp);//模板
-//        }
-//        map.put("labSecurityApply",labSecurityApplyVO);//安全准入申请信息
         if(StringUtils.isNotNull(labMessageDynamic)){
             map.put("applyId",labMessageDynamic.getDynamicId());//安全准入申请id
             if(labMessageDynamic.getMessClass()==1){
@@ -235,12 +191,10 @@ public class LabMessageUserServiceImpl implements ILabMessageUserService {
                 SysUser sysUser = rDate.getData();
                 labSecurityApplyVO.setSysUser(sysUser);
 
-                List<LabSecurityMaterialDataVO> listTemp=Collections.emptyList();//模板
+                List<LabSecurityMaterialDataVO> listTemp;//模板
                 //学生登录
                 if(UserConstants.USER_TYPE_STUDENT.equals(sysUser.getUserType())){
                     //模板查询
-//            listModel =labSecurityMaterialDataMapper.selectLabSecurityMaterialDataStudent(labSecurityApplyVO.getSubjectId());
-                    //模板查询
                     listTemp =labSecurityMaterialDataMapper.selectLabSecurityMaterialDataStudent(labSecurityApplyVO.getSubjectId());
                     for (int i=0;i<listTemp.size();i++){
                         //如果是关联模板 查询出具体关联的内容
@@ -256,8 +210,6 @@ public class LabMessageUserServiceImpl implements ILabMessageUserService {
                     map.put("listModel",listTemp);//模板
                 }else if("11".equals(sysUser.getUserType())){
                     //教职工 模板查询
-//            listModel= labSecurityMaterialDataMapper.selectLabSecurityMaterialDataTeacher(labSecurityApplyVO.getSubjectId());
-                    //教职工 模板查询
                     listTemp= labSecurityMaterialDataMapper.selectLabSecurityMaterialDataTeacher(labSecurityApplyVO.getSubjectId());
                     for (int i=0;i<listTemp.size();i++){
                         //如果是关联模板 查询出具体关联的内容

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabNegativeListRecordsServiceImpl.java

@@ -8,7 +8,6 @@ import com.zd.laboratory.domain.vo.LabBlackdetailVO;
 import com.zd.laboratory.domain.vo.LabNegativeListRecordsVO;
 import com.zd.laboratory.mapper.LabNegativeListRecordsMapper;
 import com.zd.laboratory.mapper.LabNegativelistHistoryMapper;
-import com.zd.laboratory.mapper.LabViolationMapper;
 import com.zd.laboratory.service.ILabNegativeListRecordsService;
 import com.zd.laboratory.service.ILabViolationService;
 import com.zd.model.domain.R;
@@ -49,9 +48,6 @@ public class LabNegativeListRecordsServiceImpl implements ILabNegativeListRecord
     @Autowired
     ILabViolationService violationService;
 
-    @Autowired
-    private LabViolationMapper labViolationMapper;
-
     /**
      * 查询负面清单列表
      *