From e7222278ced79bc3cbe2265a6ae97ad4ed4c22b3 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Wed, 8 Mar 2023 13:35:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=EF=BC=88?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=94=A8=E6=88=B7=E4=B8=8B=E6=8B=89=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=97=B6=EF=BC=8C=E5=B0=86=E6=B3=95=E8=A7=84=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88=E5=92=8C=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=B8=88=E5=88=86=E5=BC=80=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 43 +++++++++++++++++-- 1 file changed, 39 insertions(+), 4 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 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