From c846ee7e45d5bd14a6a43ab9024bd948be894c59 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 16 Jun 2022 18:50:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectLawsInventoryEOServiceImpl.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 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 54743a307..3065a6c35 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 @@ -5861,10 +5861,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId); List lawEngineerNameList = new ArrayList<>(); if(projectRelatedPersonnels.size() != 0){ - lawEngineerNameList = projectRelatedPersonnels.stream().map(ProjectRelatedPersonnel::getLawEngineerName).collect(Collectors.toList()); + for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) { + String lawEngineerName = projectRelatedPersonnel.getLawEngineerName(); + if(StringUtils.isNotBlank(lawEngineerName)){ + lawEngineerName = lawEngineerName.replaceAll(" ",""); + lawEngineerNameList.addAll(Arrays.asList(lawEngineerName.split(","))); + } + } } - if(StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.equals(loginUser.getUsername()) - && lawEngineerNameList.contains(loginUser.getUsername())){ + 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()); sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getName());