WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

67382 获取用户在法规清单中角色切换的数据修改。

Browse Source
This commit is contained in:
wangzhijiang
2023-03-29 09:39:16 +08:00
parent 81b35d8a07
commit d97c5447c0
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+5 -7
View File
@@ -9931,8 +9931,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
} }
} }
if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername())) if(lawEngineerNameList.contains(loginUser.getUsername())){
|| lawEngineerNameList.contains(loginUser.getUsername())){
SysRole sysRole = new SysRole(); SysRole sysRole = new SysRole();
sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
if(StringUtils.equals(cut,CutEnum.CN.getValue())){ if(StringUtils.equals(cut,CutEnum.CN.getValue())){
@@ -9942,7 +9941,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
sysRoles.add(sysRole); sysRoles.add(sysRole);
} }
List<String> certificationEngineerList = new ArrayList<>(); /*List<String> certificationEngineerList = new ArrayList<>();
if(projectRelatedPersonnels.size() != 0){ if(projectRelatedPersonnels.size() != 0){
for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){ for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){
String certificationEngineerName1 = projectRelatedPersonnel.getCertificationEngineerName(); 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()); sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getCode());
} }
sysRoles.add(sysRole); sysRoles.add(sysRole);
} }*/
List<String> engineeringInterfacePersonList = new ArrayList<>(); List<String> engineeringInterfacePersonList = new ArrayList<>();
if(projectRelatedPersonnels.size() != 0){ if(projectRelatedPersonnels.size() != 0){
@@ -9970,12 +9969,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePersonName(); String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePersonName();
if(StringUtils.isNotBlank(engineeringInterfacePerson)){ if(StringUtils.isNotBlank(engineeringInterfacePerson)){
engineeringInterfacePerson = engineeringInterfacePerson.replaceAll(" ",""); engineeringInterfacePerson = engineeringInterfacePerson.replaceAll(" ","");
certificationEngineerList.addAll(Arrays.asList(engineeringInterfacePerson.split(","))); engineeringInterfacePersonList.addAll(Arrays.asList(engineeringInterfacePerson.split(",")));
} }
} }
} }
if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername())) if(engineeringInterfacePersonList.contains(loginUser.getUsername())){
|| engineeringInterfacePersonList.contains(loginUser.getUsername())){
SysRole sysRole = new SysRole(); SysRole sysRole = new SysRole();
sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getValue()); sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getValue());
if(StringUtils.equals(cut,CutEnum.CN.getValue())){ if(StringUtils.equals(cut,CutEnum.CN.getValue())){