diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java index 5c67bfbee..05262bcc1 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java @@ -14,6 +14,9 @@ public enum ProjectRoleEnum { ADMIN("系统管理员","12","admin"), VIEWER("Viewer","13","Viewer"), BRAND_ADMINISTRATOR("品牌管理员","14","BrandAdministrator"), + //法规清单使用 + INTERFACE_PERSON1("工程接口人","15","Interface person"), + PERSON_LIABLE1("责任人","16","Person liable"), // 项目库-认证清单使用。 INTERFACE_PERSON("接口人","20","Interface person"), PERSON_LIABLE("责任人","21","Person liable"), 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 3a774ebd0..834084bca 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 @@ -9406,6 +9406,29 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl engineeringInterfacePersonList = new ArrayList<>(); + if(projectRelatedPersonnels.size() != 0){ + for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){ + String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePersonName(); + if(StringUtils.isNotBlank(engineeringInterfacePerson)){ + engineeringInterfacePerson = engineeringInterfacePerson.replaceAll(" ",""); + certificationEngineerList.addAll(Arrays.asList(engineeringInterfacePerson.split(","))); + } + } + } + if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername())) + || 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())){ + sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getName()); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getCode()); + } + sysRoles.add(sysRole); + } + // if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername())) // || lawEngineerNameList.contains(loginUser.getUsername())){ // SysRole sysRole = new SysRole(); @@ -9419,6 +9442,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryDutyPersonCountWrap = new QueryWrapper<>(); + queryDutyPersonCountWrap.lambda().eq(ProjectLawsInventoryEO::getDesignDutyId,loginUser.getId()); + Integer dutyPersonCount = this.baseMapper.selectCount(queryDutyPersonCountWrap); + if(dutyPersonCount > 0){ + SysRole sysRole = new SysRole(); + sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getValue()); + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getName()); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getCode()); + } + sysRoles.add(sysRole); + } +