合并分支 'dev_2nd_period_test' 到 'master'

Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!239

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java

@@ -684,7 +684,7 @@ public class SysPermissionController {
 			//项目参数任务
 			if(StringUtils.equals(permission.getId(), SysPermissionEnum.PROJECT_PARAMETER_TASKS.getId())){
 				boolean existTaskFlag = false;
-				existTaskFlag = sysPermissionService.judgeToDo();
+//				existTaskFlag = sysPermissionService.judgeToDo();
 				meta.put("existTask",existTaskFlag);
 			}
 			json.put("meta", meta);

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/RoleEnum.java

@@ -6,6 +6,8 @@ public enum RoleEnum {
     COUNTRU_CARD_MANAGE("countryCard管理员","countryCardManage","countryCardManage","1564916346120916993",4),
     ENGINEERING_INTERFACE_PERSON("工程接口人","engineeringInterfacePerson","engineeringInterfacePerson","1534020084667674626",5),
     ENGINEER("工程师","engineer","engineer","1534020318437208065",6),
+    HOMOLOGATION_ENGINEER("认证工程师","homologationEngineer","homologationEngineer","1534019729326239745",8),
+    REGULATION_OWNER("法规工程师","regulationOwner","regulationOwner","1534021004067500034",7),
     ;
 
     String name;

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java

@@ -289,4 +289,16 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @return
 	 */
 	boolean isEngineer(LoginUser currentUser);
+
+	/**
+	 * 验证当前登录用户是否是认证工程师角色
+	 * @return
+	 */
+	boolean isHomologationEngineer(LoginUser currentUser);
+
+	/**
+	 * 验证当前登录用户是否是法规工程师角色
+	 * @return
+	 */
+	boolean isRegulationOwner(LoginUser currentUser);
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java

@@ -656,4 +656,46 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		}
 		return result;
 	}
+
+	@Override
+	public boolean isHomologationEngineer(LoginUser currentUser) {
+		boolean result = false;
+		RoleEnum engineer = RoleEnum.HOMOLOGATION_ENGINEER;
+		List<SysUserRole> userRoleList = this.sysUserRoleMapper.selectList(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, currentUser.getId()));
+		if(CollectionUtils.isNotEmpty(userRoleList)){
+			List<SysUserRole> userRoles = userRoleList.stream().filter(userRole -> {
+				boolean flag = false;
+				if(StringUtils.equals(userRole.getRoleId(),engineer.getId())){
+					flag = true;
+				}
+				return flag;
+			}).collect(Collectors.toList());
+
+			if(CollectionUtils.isNotEmpty(userRoles)){
+				result = true;
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public boolean isRegulationOwner(LoginUser currentUser) {
+		boolean result = false;
+		RoleEnum engineer = RoleEnum.REGULATION_OWNER;
+		List<SysUserRole> userRoleList = this.sysUserRoleMapper.selectList(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, currentUser.getId()));
+		if(CollectionUtils.isNotEmpty(userRoleList)){
+			List<SysUserRole> userRoles = userRoleList.stream().filter(userRole -> {
+				boolean flag = false;
+				if(StringUtils.equals(userRole.getRoleId(),engineer.getId())){
+					flag = true;
+				}
+				return flag;
+			}).collect(Collectors.toList());
+
+			if(CollectionUtils.isNotEmpty(userRoles)){
+				result = true;
+			}
+		}
+		return result;
+	}
 }

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

@@ -141,7 +141,11 @@ public class PrehomoJob implements Job {
                             if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) {
                                 LAW_EN = LAW_CN;
                             } else {
-                                LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+                                if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) {
+                                    LAW_EN = LAW_CN;
+                                } else {
+                                    LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+                                }
                             }
 
                             List<String> twoWeeksLaterUserIdList = new ArrayList<>();

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

@@ -173,6 +173,16 @@ public class TaskAffirmJob implements Job {
                             //法规中英文
                             ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOMapper.selectById(key);
                             BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
+                            String LAW_EN = "";
+                            if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) {
+                                LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();
+                            } else {
+                                if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) {
+                                    LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();
+                                } else {
+                                    LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+                                }
+                            }
                             try {
                                 FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
                                 feishuMsgVo.setTitle(MessageType2Enum.REGULATION_TASK_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_TASK_CONFIRMATION.getEn());
@@ -182,7 +192,7 @@ public class TaskAffirmJob implements Job {
                                         "\n发起人: 系统通知");
                                 feishuMsgVo.setEnContentUpper("Hello! This task will expire in 3 days. Please check and address it in a timely manner. Thank you!");
                                 feishuMsgVo.setEnContentLower("Project:" + PRN +
-                                        "\nRegulation No: " + projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn() +
+                                        "\nRegulation No: " + LAW_EN +
                                         "\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                                 feishuMsgVo.setUrl(hrefFeishu);
                                 feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
@@ -205,6 +215,16 @@ public class TaskAffirmJob implements Job {
                             //法规中英文
                             ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOMapper.selectById(key);
                             BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
+                            String LAW_EN = "";
+                            if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) {
+                                LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();
+                            } else {
+                                if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) {
+                                    LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();
+                                } else {
+                                    LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+                                }
+                            }
                             try {
                                 FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
                                 feishuMsgVo.setTitle(MessageType2Enum.REGULATION_TASK_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_TASK_CONFIRMATION.getEn());
@@ -214,7 +234,7 @@ public class TaskAffirmJob implements Job {
                                         "\n发起人: 系统通知");
                                 feishuMsgVo.setEnContentUpper("Hello! This task will expire today. Please check and address the task ASAP. Thank you!");
                                 feishuMsgVo.setEnContentLower("Project:" + PRN +
-                                        "\nRegulation No: " + projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn() +
+                                        "\nRegulation No: " + LAW_EN +
                                         "\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                                 feishuMsgVo.setUrl(hrefFeishu);
                                 feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
@@ -236,7 +256,16 @@ public class TaskAffirmJob implements Job {
                             //法规中英文
                             ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOMapper.selectById(key);
                             BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
-
+                            String LAW_EN = "";
+                            if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) {
+                                LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();
+                            } else {
+                                if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) {
+                                    LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();
+                                } else {
+                                    LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+                                }
+                            }
                             String dueDate = sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate());
                             try {
                                 FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
@@ -248,7 +277,7 @@ public class TaskAffirmJob implements Job {
                                         "\n截止时间: " + dueDate);
                                 feishuMsgVo.setEnContentUpper("Hello! This task is overdue. Please address it ASAP. Thank you!");
                                 feishuMsgVo.setEnContentLower("Project:" + PRN +
-                                        "\nRegulation No: " + projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn() +
+                                        "\nRegulation No: " + LAW_EN +
                                         "\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName() +
                                         "\nDue Date: " + dueDate);
                                 feishuMsgVo.setUrl(hrefFeishu);

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

@@ -140,7 +140,11 @@ public class VerifyComplianceJob implements Job {
                             if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) {
                                 LAW_EN = LAW_CN;
                             } else {
-                                LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+                                if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) {
+                                    LAW_EN = LAW_CN;
+                                } else {
+                                    LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+                                }
                             }
 
                             List<String> twoWeeksLaterUserIdList = new ArrayList<>();

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

@@ -140,7 +140,11 @@ public class designComplianceJob implements Job {
                             if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) {
                                 LAW_EN = LAW_CN;
                             } else {
-                                LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+                                if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) {
+                                    LAW_EN = LAW_CN;
+                                } else {
+                                    LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+                                }
                             }
 
 

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

@@ -87,11 +87,15 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
 
         /**
          * 2022-11-01  增加数据权限：如果当前登录用户，是工程师、工程接口人角色，只能查看到跟自己相关的数据。其余角色保留之前的查询结果。
+         * 2022-11-04  增加法规、认证工程师与上方权限一致。
          */
         LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        boolean isAdministrator = this.sysUserService.isAdministrator();
         boolean isEngineer = this.sysUserService.isEngineer(currentUser);
         boolean isEngineeringInterfacePerson = this.sysUserService.isEngineeringInterfacePerson(currentUser);
-        if(isEngineer || isEngineeringInterfacePerson){
+        boolean isHomologationEngineer = this.sysUserService.isHomologationEngineer(currentUser);
+        boolean isRegulationOwner = this.sysUserService.isRegulationOwner(currentUser);
+        if((isEngineer || isEngineeringInterfacePerson || isHomologationEngineer || isRegulationOwner) && !isAdministrator){
             params.put("currentUserId",currentUser.getId());
             params.put("isEngineerOrEngineeringInterfacePerson",true);
         }
@@ -159,11 +163,15 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
     public JSONObject queryComplianceResultList(Map<String, Object> params) {
         /**
          * 2022-11-01  增加数据权限：如果当前登录用户，是工程师、工程接口人角色，只能查看到跟自己相关的数据。其余角色保留之前的查询结果。
+         * 2022-11-04  增加法规、认证工程师与上方权限一致。
          */
         LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        boolean isAdministrator = this.sysUserService.isAdministrator();
         boolean isEngineer = this.sysUserService.isEngineer(currentUser);
         boolean isEngineeringInterfacePerson = this.sysUserService.isEngineeringInterfacePerson(currentUser);
-        if(isEngineer || isEngineeringInterfacePerson){
+        boolean isHomologationEngineer = this.sysUserService.isHomologationEngineer(currentUser);
+        boolean isRegulationOwner = this.sysUserService.isRegulationOwner(currentUser);
+        if((isEngineer || isEngineeringInterfacePerson || isHomologationEngineer || isRegulationOwner) && !isAdministrator){
             params.put("currentUserId",currentUser.getId());
             params.put("isEngineerOrEngineeringInterfacePerson",true);
         }
@@ -177,8 +185,8 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
             QueryWrapper<ProjectTaskInventoryDetailEO> taskDetailQueryWrapper = new QueryWrapper<>();
             taskDetailQueryWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,projectLawsInventoryIdList);
             List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList = this.projectTaskInventoryDetailEOMapper.selectList(taskDetailQueryWrapper);
-            this.createTaskInventoryEOList(complianceResultList,projectTaskInventoryDetailEOList,currentUser,isEngineer,isEngineeringInterfacePerson);
+            this.createTaskInventoryEOList(complianceResultList,projectTaskInventoryDetailEOList,currentUser,isEngineer,isEngineeringInterfacePerson,isHomologationEngineer,isRegulationOwner);
-            this.disposeComplianceResult(complianceResultList,cut,isEngineer,isEngineeringInterfacePerson);
+            this.disposeComplianceResult(complianceResultList,cut,isEngineer,isEngineeringInterfacePerson,isHomologationEngineer,isRegulationOwner,isAdministrator);
         }
         result.put("complianceResultList",complianceResultList);
 
@@ -187,18 +195,19 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
         opinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getStandId,id);
         opinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getGatherResult,GatherResultEnum.COMPLETED.getValue());
         //如果当前登录用户是工程师或工程接口人，只查询自己为评估人的法规意见收集数据。
-        if(isEngineer || isEngineeringInterfacePerson){
+        if(!isAdministrator){
             opinionGatherEOQueryWrapper.lambda().like(LawsOpinionGatherEO::getEvaluatorIds,currentUser.getId());
         }
         int opinionGatherCount = this.lawsOpinionGatherEOService.count(opinionGatherEOQueryWrapper);
         result.put("opinionGather",opinionGatherCount);
 
+        //如果登录人不是超级管理员，则只能看到跟自己相关的数据
         //查询当前数据是否有法规技术评估流程数据
         QueryWrapper<LawsTechnologyEvaluationEO> evaluationEOQueryWrapper = new QueryWrapper<>();
         evaluationEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationEO::getStandId,id);
         evaluationEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationEO::getFlowStatus,GatherResultEnum.COMPLETED.getValue());
         //如果当前登录用户是工程师或工程接口人，只查询自己为评估人的法规技术评估数据。
-        if(isEngineer || isEngineeringInterfacePerson){
+        if(!isAdministrator){
             this.lawsTechnologyEvaluationEOService.createQueryPermission(evaluationEOQueryWrapper,null,false);
         }
         int evaluationCount = this.lawsTechnologyEvaluationEOService.count(evaluationEOQueryWrapper);
@@ -218,7 +227,9 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
                                            List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList,
                                            LoginUser currentUser,
                                            boolean isEngineer,
-                                           boolean isEngineeringInterfacePerson) {
+                                           boolean isEngineeringInterfacePerson,
+                                           boolean isHomologationEngineer,
+                                           boolean isRegulationOwner) {
         if(CollectionUtils.isNotEmpty(complianceResultList) && CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOList)){
             for (Map<String, Object> complianceResult : complianceResultList) {
                 String designPid = "";
@@ -239,7 +250,8 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
                 String verifyTaskDefinitionKey = "";
                 String verifyTaskDetailId = "";
                 //2022-11-01 增加数据权限：如果当前登录用户，是工程师、工程接口人角色，只能查看到跟自己相关的数据。其余角色保留之前的查询结果。
-                if((isEngineer || isEngineeringInterfacePerson)){
+                //2022-11-04  增加法规、认证工程师与上方权限一致。
+                if((isEngineer || isEngineeringInterfacePerson || isHomologationEngineer || isRegulationOwner)){
                     for (ProjectTaskInventoryDetailEO projectTaskInventoryDetail : projectTaskInventoryDetailEOList) {
                         if(StringUtils.equals(complianceResult.get("id").toString(),projectTaskInventoryDetail.getProjectTaskInventoryId())){
                             /**
@@ -359,14 +371,20 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
         }
     }
 
-    public void disposeComplianceResult(List<Map<String,Object>> complianceResultList,String cut,boolean isEngineer,boolean isEngineeringInterfacePerson){
+    public void disposeComplianceResult(List<Map<String,Object>> complianceResultList,
+                                        String cut,
+                                        boolean isEngineer,
+                                        boolean isEngineeringInterfacePerson,
+                                        boolean isHomologationEngineer,
+                                        boolean isRegulationOwner,
+                                        boolean isAdministrator){
         if(CollectionUtils.isNotEmpty(complianceResultList)){
             LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             List<SysDictItem> dutyTerritoryDictItemList = sysDictItemService.selectItemsByDictCode("duty_territory");
             for (Map<String, Object> complianceResult : complianceResultList) {
-                if(isEngineer || isEngineeringInterfacePerson){
+                if((isEngineer || isEngineeringInterfacePerson || isHomologationEngineer || isRegulationOwner) && !isAdministrator){
                     if(!StringUtils.equals(complianceResult.get("designInitiatorId").toString(),currentUser.getId())
-                            || !StringUtils.equals(complianceResult.get("designDutyId").toString(),currentUser.getId())){
+                            && !StringUtils.equals(complianceResult.get("designDutyId").toString(),currentUser.getId())){
                         complianceResult.put("designStatus","");
                         complianceResult.put("designFlowTaskStatus","");
                         complianceResult.put("designPId","");
@@ -461,9 +479,12 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
         List<Map<String,Object>> exportData = new ArrayList<>();
 
         LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        boolean isAdministrator = this.sysUserService.isAdministrator();
         boolean isEngineer = this.sysUserService.isEngineer(currentUser);
         boolean isEngineeringInterfacePerson = this.sysUserService.isEngineeringInterfacePerson(currentUser);
-        if(isEngineer || isEngineeringInterfacePerson){
+        boolean isHomologationEngineer = this.sysUserService.isHomologationEngineer(currentUser);
+        boolean isRegulationOwner = this.sysUserService.isRegulationOwner(currentUser);
+        if((isEngineer || isEngineeringInterfacePerson || isHomologationEngineer || isRegulationOwner) && !isAdministrator){
             params.put("currentUserId",currentUser.getId());
             params.put("isEngineerOrEngineeringInterfacePerson",true);
         }
@@ -484,7 +505,7 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
             List<Map<String,Object>> complianceResultList = new ArrayList<>();
             if(CollectionUtils.isNotEmpty(idList)){
                 complianceResultList = this.lawsComplianceBoardMapper.queryComplianceResultList(params);
-                this.disposeComplianceResult(complianceResultList,cut,isEngineer,isEngineeringInterfacePerson);
+                this.disposeComplianceResult(complianceResultList,cut,isEngineer,isEngineeringInterfacePerson,isHomologationEngineer,isRegulationOwner,isAdministrator);
             }
 
             String title = "";
@@ -596,16 +617,20 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
         String cut = (String) params.get("cut");
         /**
          * 2022-11-01  增加数据权限：如果当前登录用户，是工程师、工程接口人角色，只能查看到跟自己相关的数据。其余角色保留之前的查询结果。
+         * 2022-11-04  增加法规、认证工程师与上方权限一致。
          */
         LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        boolean isAdministrator = this.sysUserService.isAdministrator();
         boolean isEngineer = this.sysUserService.isEngineer(currentUser);
         boolean isEngineeringInterfacePerson = this.sysUserService.isEngineeringInterfacePerson(currentUser);
-        if(isEngineer || isEngineeringInterfacePerson){
+        boolean isHomologationEngineer = this.sysUserService.isHomologationEngineer(currentUser);
+        boolean isRegulationOwner = this.sysUserService.isRegulationOwner(currentUser);
+        if((isEngineer || isEngineeringInterfacePerson || isHomologationEngineer || isRegulationOwner) && !isAdministrator){
             params.put("currentUserId",currentUser.getId());
             params.put("isEngineerOrEngineeringInterfacePerson",true);
         }
         List<Map<String,Object>> exportData = this.lawsComplianceBoardMapper.queryComplianceResultList(params);
-        this.disposeComplianceResult(exportData,cut,isEngineer,isEngineeringInterfacePerson);
+        this.disposeComplianceResult(exportData,cut,isEngineer,isEngineeringInterfacePerson,isHomologationEngineer,isRegulationOwner,isAdministrator);
         String title = "";
         String fileName = "";
         if(StringUtils.equals(cut, CutEnum.CN.getValue())){

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

@@ -1638,6 +1638,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 						//法规中英文
 						BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
+						String LAW_EN = "";
+						if (ObjectUtils.isNotEmpty(bussDocumentLibraryEO)) {
+							if (ObjectUtils.isNotEmpty(bussDocumentLibraryEO.getTitleEn())) {
+								LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();
+							} else {
+								LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();
+							}
+						}else {
+							LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();
+						}
 
 						if(isProjectRole == Integer.parseInt(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue())){
 							projectLawsInventoryEO.setRegulationOwnerSubmitStatus(operatorResult);
@@ -1730,7 +1740,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 												"\n截止时间: " + dueDate);
 										feishuMsgVo.setEnContentUpper("Hello! This task is rejected by "+ currentUser.getUsername() +". Please check and address it in a timely manner");
 										feishuMsgVo.setEnContentLower("Project: " + projectName +
-												"\nRegulation No: " + projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn() +
+												"\nRegulation No: " + LAW_EN +
 												"\nInitiator: " + currentUser.getUsername() +
 												"\nDue Date: "+ dueDate);
 										feishuMsgVo.setUrl(hrefFeishu);
@@ -1795,7 +1805,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 												"\n截止时间: " + dueDate);
 										feishuMsgVo.setEnContentUpper("Hello! This task is rejected by "+ currentUser.getUsername() +". Please check and address it in a timely manner");
 										feishuMsgVo.setEnContentLower("Project: " + projectName +
-												"\nRegulation No: " + projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn() +
+												"\nRegulation No: " + LAW_EN +
 												"\nInitiator: " + currentUser.getUsername() +
 												"\nDue Date: " + dueDate);
 										feishuMsgVo.setUrl(hrefFeishu);
@@ -2479,8 +2489,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		String PRN = LibraryBase.getProjectName();//项目名称
 		String LAW_CN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();//法规
 		BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
-		String LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+		String LAW_EN = "";
-
+		if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) {
+			LAW_EN = LAW_CN;
+		} else {
+			if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) {
+				LAW_EN = LAW_CN;
+			} else {
+				LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+			}
+		}
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
 		if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue())) {
@@ -8829,6 +8847,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					String dueDate = new SimpleDateFormat("yyyy-MM-dd").format(projectLawsInventoryEO.getTaskAffirmDueDate());
 					//法规中英文
 					BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
+					String LAW_EN = "";
+					if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) {
+						LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();
+					} else {
+						if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) {
+							LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();
+						} else {
+							LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+						}
+					}
 
 					List<String> thirdIdList = new ArrayList<>();
 					List<SysUser> sysUsers = sysUserService.listByIds(taskAffirmUserIdList);
@@ -8845,7 +8873,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 								"\n截止时间: " + dueDate);
 						feishuMsgVo.setEnContentUpper("Hello! Please check and address the task ASAP. Thank you!");
 						feishuMsgVo.setEnContentLower("Project: " + PRN +
-								"\nRegulation No: " + projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn() +
+								"\nRegulation No: " + LAW_EN +
 								"\nInitiator: " + currentUser.getUsername() +
 								"\nDue Date: "+ dueDate);
 						feishuMsgVo.setUrl(hrefFeishu);

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

@@ -33,6 +33,7 @@ import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
 import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -371,7 +372,16 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 		//法规中英文
 		String LAW_CN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();//法规
 		BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
-		String LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+		String LAW_EN = "";
+		if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) {
+			LAW_EN = LAW_CN;
+		} else {
+			if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) {
+				LAW_EN = LAW_CN;
+			} else {
+				LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+			}
+		}
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		//FeishuMsgVo feishuMsgVo = new FeishuMsgVo();

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

@@ -35,6 +35,7 @@ import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum;
 import com.jero.modules.wkflow.enums.FlowTypeEnum;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -413,8 +414,16 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 		ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOMapper.selectOne(projectLawsInventoryEOQueryWrapper);
 		String LAW_CN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();//法规
 		BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
-		String LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+		String LAW_EN = "";
-
+		if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) {
+			LAW_EN = LAW_CN;
+		} else {
+			if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) {
+				LAW_EN = LAW_CN;
+			} else {
+				LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+			}
+		}
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -1029,8 +1038,16 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 		String LAW_CN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();//法规
 		BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
-		String LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+		String LAW_EN = "";
-
+		if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) {
+			LAW_EN = LAW_CN;
+		} else {
+			if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) {
+				LAW_EN = LAW_CN;
+			} else {
+				LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+			}
+		}
 		if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue())) {
 			//taskKey = DesignComplianceNodeEnum.DRE_DISPOSE.getKey();
 

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

@@ -24,6 +24,7 @@ import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum;
 import com.jero.modules.wkflow.enums.FlowTypeEnum;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -187,7 +188,16 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 				//法规中英文
 				String LAW_CN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();//法规
 				BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
-				String LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+				String LAW_EN = "";
+				if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) {
+					LAW_EN = LAW_CN;
+				} else {
+					if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) {
+						LAW_EN = LAW_CN;
+					} else {
+						LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+					}
+				}
 
 				String flowType = projectTaskInventoryFeedbackEO.getFlowType();
 				if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){
@@ -502,8 +512,16 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 				//法规中英文
 				String LAW_CN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();//法规
 				BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
-				String LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+				String LAW_EN = "";
-
+				if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) {
+					LAW_EN = LAW_CN;
+				} else {
+					if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) {
+						LAW_EN = LAW_CN;
+					} else {
+						LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+					}
+				}
 				String flowType = projectTaskInventoryFeedbackEO.getFlowType();
 				if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){
 					//msgContentEN = currentUser.getUsername() + " has submitted the engineering deliverable information of "

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml

@@ -88,7 +88,8 @@
                 LEFT JOIN sys_user createBy on createBy.id = pi.create_by
                 LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id
             <where>
-                 and pi.id IN (
+                <if test="params.queryType != 'issuedProcess'">
+                    and pi.id IN (
                         SELECT
                             pid.process_info_id
                         FROM
@@ -99,7 +100,9 @@
                                 and pid.status = #{params.taskStatus}
                             </if>
                         </where>
-                )
+                    )
+                </if>
+
                 <if test="params.flowTypeList != null">
                     and pi.flow_type in
                     <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
@@ -287,18 +290,20 @@
                 <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
-                and (
+                <if test="params.queryType != 'issuedProcess'">
-                    pi.id IN (
+                    and (
-                        SELECT
+                        pi.id IN (
-                            pid.process_info_id
+                            SELECT
-                        FROM
+                                pid.process_info_id
-                            process_info_detail pid
+                            FROM
-                        where pid.user_id = #{params.currentUserId}
+                                process_info_detail pid
-                        <if test="params.taskStatus != null and params.taskStatus != ''">
+                            where pid.user_id = #{params.currentUserId}
-                            and pid.status = #{params.taskStatus}
+                            <if test="params.taskStatus != null and params.taskStatus != ''">
-                        </if>
+                                and pid.status = #{params.taskStatus}
+                            </if>
+                        )
                     )
-                )
+                </if>
                 <if test="params.queryType == 'issuedProcess'">
                     and pi.create_by = #{params.createBy}
                 </if>