update

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -2820,6 +2820,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
                     if(StringUtils.isNotBlank(paramsCollectManifestVO.getProjectId())){
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(paramsCollectManifestVO.getProjectId());
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取法规清单 - 飞书跳转链接
@@ -2843,6 +2844,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 //                        params.put("back_url_en",(String)hrefFeishuMap.get("hrefFeishu_en"));
                             feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_GREEN.getValue(),params,null);
                         }
+                    }
                 } catch (Exception e) {
                     log.error("飞书消息推送失败");
                 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java

@@ -70,7 +70,7 @@ public class CertificationInventoryJob implements Job {
 
                     if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOS)){
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
-
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             if(StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())){
                                 // 消息提醒 认证工程师 认证清单数据
                                 this.remindCertificationEngineer(projectCertificationInventoryEOS,projectLibraryBase);
@@ -81,6 +81,7 @@ public class CertificationInventoryJob implements Job {
                     }
                 }
             }
+        }
         log.info("认证清单，定时任务结束 =====================================================");
     }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java

@@ -130,6 +130,7 @@ public class InventoryAffirmJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取法规清单 - 飞书跳转链接
@@ -140,6 +141,7 @@ public class InventoryAffirmJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params);
                         }
+                    }
                     // 当天结束的
                     List<ProjectLawsInventoryEO> currentDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("currentDaysList");
                     if(CollectionUtils.isNotEmpty(currentDaysList)){
@@ -159,6 +161,7 @@ public class InventoryAffirmJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取法规清单 - 飞书跳转链接
@@ -169,6 +172,7 @@ public class InventoryAffirmJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params);
                         }
+                    }
                     // 逾期的
                     List<ProjectLawsInventoryEO> overdueList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("overdueList");
                     if(CollectionUtils.isNotEmpty(overdueList)){
@@ -188,6 +192,7 @@ public class InventoryAffirmJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取法规清单 - 飞书跳转链接
@@ -201,6 +206,7 @@ public class InventoryAffirmJob implements Job {
                     }
                 }
             }
+        }
 
 
       /*   //获取状态为待确认的数据

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java

@@ -137,6 +137,7 @@ public class TaskAffirmJob implements Job {
                         params.put("flowTypeEn","Design Compliance Process");
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -154,6 +155,7 @@ public class TaskAffirmJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
                         }
+                    }
                     // 当天结束的
                     List<ProjectLawsInventoryEO> currentDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("currentDaysList");
                     if(CollectionUtils.isNotEmpty(currentDaysList)){
@@ -175,6 +177,7 @@ public class TaskAffirmJob implements Job {
                         params.put("flowTypeEn","Design Compliance Process");
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -192,6 +195,7 @@ public class TaskAffirmJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
                         }
+                    }
                     // 逾期的
                     List<ProjectLawsInventoryEO> overdueList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("overdueList");
                     if(CollectionUtils.isNotEmpty(overdueList)){
@@ -213,6 +217,7 @@ public class TaskAffirmJob implements Job {
                         params.put("flowTypeEn","Design Compliance Process");
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -231,6 +236,7 @@ public class TaskAffirmJob implements Job {
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params);
                         }
                     }
+                }
                 // 验证符合性
                 Map<String, List<ProjectLawsInventoryEO>> lawsInventoryByVerifyDutyIdGroupMap = lawsInventoryListByProjectLibraryId.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getVerifyDutyId));
 
@@ -266,6 +272,7 @@ public class TaskAffirmJob implements Job {
                         params.put("flowTypeEn","Validation Compliance Process");
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -283,6 +290,7 @@ public class TaskAffirmJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
                         }
+                    }
                     // 当天结束的
                     List<ProjectLawsInventoryEO> currentDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("currentDaysList");
                     if(CollectionUtils.isNotEmpty(currentDaysList)){
@@ -304,6 +312,7 @@ public class TaskAffirmJob implements Job {
                         params.put("flowTypeEn","Validation Compliance Process");
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -321,6 +330,7 @@ public class TaskAffirmJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
                         }
+                    }
                     // 逾期的
                     List<ProjectLawsInventoryEO> overdueList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("overdueList");
                     if(CollectionUtils.isNotEmpty(overdueList)){
@@ -342,6 +352,7 @@ public class TaskAffirmJob implements Job {
                         params.put("flowTypeEn","Validation Compliance Process");
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -361,6 +372,7 @@ public class TaskAffirmJob implements Job {
                         }
                     }
                 }
+            }
 
         }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java

@@ -126,6 +126,7 @@ public class VerifyComplianceJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -143,6 +144,7 @@ public class VerifyComplianceJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
                         }
+                    }
 
                     // 七天后结束的
                     List<ProjectLawsInventoryEO> sevenDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("sevenDaysList");
@@ -163,6 +165,7 @@ public class VerifyComplianceJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -180,6 +183,7 @@ public class VerifyComplianceJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
                         }
+                    }
 
                     // 当天结束的
                     List<ProjectLawsInventoryEO> currentDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("currentDaysList");
@@ -200,6 +204,7 @@ public class VerifyComplianceJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -217,6 +222,7 @@ public class VerifyComplianceJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
                         }
+                    }
                     // 逾期的
                     List<ProjectLawsInventoryEO> overdueList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("overdueList");
                     if(CollectionUtils.isNotEmpty(overdueList)){
@@ -236,6 +242,7 @@ public class VerifyComplianceJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -256,6 +263,7 @@ public class VerifyComplianceJob implements Job {
                     }
                 }
             }
+        }
 
         //查询出已经启动了验证符合性流程的数据。 并且流程没有结束。
         /*QueryWrapper<ProjectTaskInventoryEO> queryProjectTaskInventoryWrapper = new QueryWrapper<>();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java

@@ -126,6 +126,7 @@ public class designComplianceJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -143,6 +144,7 @@ public class designComplianceJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
                         }
+                    }
 
                     // 七天后结束的
                     List<ProjectLawsInventoryEO> sevenDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("sevenDaysList");
@@ -163,6 +165,7 @@ public class designComplianceJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -180,6 +183,7 @@ public class designComplianceJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
                         }
+                    }
 
                     // 当天结束的
                     List<ProjectLawsInventoryEO> currentDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("currentDaysList");
@@ -200,6 +204,7 @@ public class designComplianceJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -217,6 +222,7 @@ public class designComplianceJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
                         }
+                    }
                     // 逾期的
                     List<ProjectLawsInventoryEO> overdueList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("overdueList");
                     if(CollectionUtils.isNotEmpty(overdueList)){
@@ -236,6 +242,7 @@ public class designComplianceJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -255,6 +262,7 @@ public class designComplianceJob implements Job {
                         }
                     }
                 }
+            }
 
         }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java

@@ -213,6 +213,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			if(CollectionUtils.isNotEmpty(editEndTimeCertificationInventoryEOS)){
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(editEndTimeCertificationInventoryEOS.get(0).getProjectLibraryId());
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					List<String> userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
 					List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
 
@@ -227,6 +228,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					);
 				}
 			}
+		}
 
 		// 如果编辑了责任人，给责任人发消息
 		if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getDutyPerson())){
@@ -622,6 +624,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 				if (CollectionUtils.isNotEmpty(projectCertificationInventoryEOS)) {
 					ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId());
+					if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 						List<String> userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
 						List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
 
@@ -634,6 +637,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 						);
 					}
 				}
+			}
 			if(CollectionUtils.isNotEmpty(updateList)){
 				this.updateBatchById(updateList);
 			}
@@ -674,7 +678,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
 		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId());
-
+		if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 
@@ -719,6 +723,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				log.error("飞书消息推送失败");
 			}
 		}
+	}
 
 	/**
 	 * 处理提示信息
@@ -1084,6 +1089,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		String projectLibraryId = json.getString("projectLibraryId");
 		// 获取项目信息，获取认证工程师，给认证工程师分配待办任务
 		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 			if(ObjectUtils.isEmpty(projectLibraryBase)){
@@ -1155,6 +1161,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					log.error("飞书消息推送失败");
 				}
 			});
+		}
 
 		return Result.OK("发布成功！");
 	}
@@ -4802,6 +4809,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 			String projectLibraryId = pciList.get(0).getProjectLibraryId();
 			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 				List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(",")));
 
 				String certificationEngineerUserNames = "";
@@ -4926,6 +4934,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				}
 			}
 		}
+	}
 
 	/**
 	 * 保存认证清单修改历史（编辑、批量设置专用）

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -790,6 +790,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber());
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -873,6 +874,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					}
 				}
 			}
+		}
 		if((projectLawsInventoryOld.getDesignDueDate() != null && projectLawsInventoryEO.getDesignDueDate() != null) && toBeCheckedFlag){
 			if(!projectLawsInventoryOld.getDesignDueDate().equals(projectLawsInventoryEO.getDesignDueDate())){
 				String endTime = "";
@@ -891,6 +893,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber());
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -907,6 +910,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 				}
 			}
+		}
 		if((projectLawsInventoryOld.getVerifyDueDate() != null && projectLawsInventoryEO.getVerifyDueDate() != null) && toBeCheckedFlag){
 			if(!projectLawsInventoryOld.getVerifyDueDate().equals(projectLawsInventoryEO.getVerifyDueDate())){
 				String endTime = "";
@@ -925,6 +929,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber());
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -941,6 +946,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 				}
 			}
+		}
 
 		// 设计符合性 任务待确认消息 标识
 		boolean toBeConfirmedDesignFlag = (
@@ -966,6 +972,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber());
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -982,6 +989,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 				}
 			}
+		}
 
 		// 验证符合性 任务待确认消息 标识
 		boolean toBeConfirmedVerifyFlag = (
@@ -1006,6 +1014,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber());
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -1022,6 +1031,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 				}
 			}
+		}
 
 		// 如果编辑了法规工程师，给新的法规工程师发消息
 		if((StringUtils.isNotEmpty(projectLawsInventoryOld.getRegulationOwnerId()) && StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId()))){
@@ -1050,6 +1060,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					params.put("serialNumbers",projectLawsInventoryEO.getSerialNumber());
 
 					ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+					if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 						String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 						String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 						// 获取待办中心 - 飞书跳转链接
@@ -1066,6 +1077,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 						this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
 					}
+				}
 
 				// 验证符合性 结果待审查、结果待提交 标识  判断法规工程师是否被修改了  如果被修改了，给新的法规工程师发消息
 				boolean toBeReviewedVerifyFlag = (
@@ -1088,6 +1100,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 
 					ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+					if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 						String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 						String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 						// 获取待办中心 - 飞书跳转链接
@@ -1107,6 +1120,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	private void setProjectLawsInventoryPermission(String userId, String projectId,String lawsInventoryId,Date now, List<ProjectUserPermission> adds, String belong) {
 		QueryWrapper<ProjectUserPermission> del = new QueryWrapper<>();
@@ -3515,6 +3529,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			String projectLibraryId = (String) prarams.get("projectLibraryId");
 			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 				String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 				// 获取待办中心 - 飞书跳转链接
@@ -3534,6 +3549,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 				this.sendMessageByTemplateId(templateId,prarams);
 			}
+		}
 
 		// 将法规工程师的 法规清单确认待办中心任务转为已办
 		if(StringUtils.equals(operatorType,OperatorTypeEnum.TO_DO_CENTER_FG_CONVERT_TO_HAVE_DONE.getValue())){
@@ -6648,6 +6664,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			paramsMsg.put("serialNumbers",serialNumbers);
 
 			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 				String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 				// 获取法规清单 - 飞书跳转链接
@@ -6656,9 +6673,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				paramsMsg.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 				paramsMsg.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
-
 				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),paramsMsg);
 			}
+		}
 		return Result.OK("变更成功！");
 	}
 
@@ -10314,6 +10331,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",serialNumbers);
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -10333,6 +10351,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	/**
 	 * 验证符合性 清单待确认状态数据催办
@@ -10376,6 +10395,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",serialNumbers);
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -10395,6 +10415,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	/**
 	 * 验证符合性 结果待审查状态数据催办。
@@ -10439,6 +10460,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",serialNumbers);
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -10457,6 +10479,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	/**
 	 * 验证符合性 清单待校核状态数据催办。
@@ -10501,6 +10524,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",serialNumbers);
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取法规清单 - 飞书跳转链接
@@ -10513,6 +10537,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	/**
 	 * 设计符合性 结果待提交状态数据催办
@@ -10556,6 +10581,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",serialNumbers);
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -10575,6 +10601,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	/**
 	 * 设计符合性 清单待确认状态数据催办
@@ -10618,6 +10645,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",serialNumbers);
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -10637,6 +10665,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	/**
 	 * 设计符合性 结果待审查状态数据催办
@@ -10681,6 +10710,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",serialNumbers);
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -10699,6 +10729,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	/**
 	 * 设计符合性 清单待校核状态数据催办
@@ -10743,6 +10774,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",serialNumbers);
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取法规清单 - 飞书跳转链接
@@ -10755,6 +10787,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 
 	@Override
@@ -11436,6 +11469,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		params.put("userIdList",userIdList);
 
 		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 			// 获取法规清单 - 飞书跳转链接
@@ -11445,6 +11479,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			params.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
 			this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params);
+		}
 
 		return Result.OK("发起清单确认成功！");
 	}
@@ -11525,6 +11560,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		params.put("serialNumbers",serialNumbers);
 
 		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 			// 获取法规清单 - 飞书跳转链接
@@ -11534,6 +11570,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			params.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
 			this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),params);
+		}
 
 		return Result.OK("撤回成功！");
 	}
@@ -11545,6 +11582,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
 		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 
@@ -11602,6 +11640,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			params.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
 			this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE3.getValue(),params);
+		}
 		return Result.OK("退回成功！");
 	}
 
@@ -11662,11 +11701,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			String hrefFeishu_EN = (String) params.get("hrefFeishu_EN");
 
 			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
-
+			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 				String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 
-
 				try {
 					for (String userId : userIdList) {
 						String thirdId = this.sysUserService.getUserThirdIdByUserId(userInfoList,userId);
@@ -11701,6 +11739,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	@Override
 	public Map<String, Object> getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN,String roleOpen) {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java

@@ -2014,7 +2014,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 	@Override
 	public ProjectLibraryBase selectById(String projectLibraryId) {
+		ProjectLibraryBase result = null;
 		List<ProjectLibraryBase> records = this.projectLibraryBaseMapper.queryById(projectLibraryId);
+		if(CollectionUtils.isNotEmpty(records)){
 			List<String> studioEngineerUserIdList = records.stream().map(ProjectLibraryBase::getStudioEngineer).distinct().collect(Collectors.toList());
 			List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(studioEngineerUserIdList);
 			disposeData(records,"",false);
@@ -2068,7 +2070,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 					}
 				}
 			}
-		return records.get(0);
+
+			result = records.get(0);
+		}
+		return result;
 	}
 }