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 2a9e6a82e..3a774ebd0 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 @@ -9377,15 +9377,50 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl certificationEngineerList = new ArrayList<>(); + if(projectRelatedPersonnels.size() != 0){ + for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){ + String certificationEngineerName1 = projectRelatedPersonnel.getCertificationEngineerName(); + if(StringUtils.isNotBlank(certificationEngineerName1)){ + certificationEngineerName1 = certificationEngineerName1.replaceAll(" ",""); + certificationEngineerList.addAll(Arrays.asList(certificationEngineerName1.split(","))); + } + } + } + if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername())) + || certificationEngineerList.contains(loginUser.getUsername())){ + SysRole sysRole = new SysRole(); + sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getName()); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getCode()); + } + sysRoles.add(sysRole); + } +// if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername())) +// || lawEngineerNameList.contains(loginUser.getUsername())){ +// SysRole sysRole = new SysRole(); +// sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue()); +// if(StringUtils.equals(cut,CutEnum.CN.getValue())){ +// sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getName()); +// }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ +// sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getCode()); +// } +// sysRoles.add(sysRole); +// +// } + + + List roleList = sysRoleMapper.getRoleByUserId(loginUser.getId()); //studio角色,法规工程师/认证工程师,领导角色,管理员角色,Viewer