From d97c5447c0c0e07faf8ff750e68af7fe6461e8a0 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Wed, 29 Mar 2023 09:39:16 +0800
Subject: [PATCH] =?UTF-8?q?67382=20=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=9C=A8=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E4=B8=AD=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E5=88=87=E6=8D=A2=E7=9A=84=E6=95=B0=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLawsInventoryEOServiceImpl.java      | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 1f8ef5937..4b6431dae 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -9931,8 +9931,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
-		if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))
-				|| lawEngineerNameList.contains(loginUser.getUsername())){
+		if(lawEngineerNameList.contains(loginUser.getUsername())){
 			SysRole sysRole = new SysRole();
 			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
 			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
@@ -9942,7 +9941,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			}
 			sysRoles.add(sysRole);
 		}
-		List<String> certificationEngineerList = new ArrayList<>();
+		/*List<String> certificationEngineerList = new ArrayList<>();
 		if(projectRelatedPersonnels.size() != 0){
 			for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){
 				String certificationEngineerName1 = projectRelatedPersonnel.getCertificationEngineerName();
@@ -9962,7 +9961,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getCode());
 			}
 			sysRoles.add(sysRole);
-		}
+		}*/
 
 		List<String> engineeringInterfacePersonList = new ArrayList<>();
 		if(projectRelatedPersonnels.size() != 0){
@@ -9970,12 +9969,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePersonName();
 				if(StringUtils.isNotBlank(engineeringInterfacePerson)){
 					engineeringInterfacePerson = engineeringInterfacePerson.replaceAll(" ","");
-					certificationEngineerList.addAll(Arrays.asList(engineeringInterfacePerson.split(",")));
+					engineeringInterfacePersonList.addAll(Arrays.asList(engineeringInterfacePerson.split(",")));
 				}
 			}
 		}
-		if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))
-				|| engineeringInterfacePersonList.contains(loginUser.getUsername())){
+		if(engineeringInterfacePersonList.contains(loginUser.getUsername())){
 			SysRole sysRole = new SysRole();
 			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getValue());
 			if(StringUtils.equals(cut,CutEnum.CN.getValue())){