From 91724e6816bde7fa937eb629414f1395ecf6b5e6 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 18 Apr 2023 13:55:02 +0800 Subject: [PATCH] update --- .../impl/ProjectRelatedPersonnelServiceImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 9fdee8e89..674640af9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -1832,23 +1832,24 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); - String engineeringInterfacePersonIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineeringInterfacePerson())) - .map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).collect(Collectors.joining(",")); + String engineeringInterfacePersonIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineeringInterfacePerson) + .filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(",")); if(StringUtils.isNotEmpty(engineeringInterfacePersonIds)){ userIdList.addAll(Arrays.asList(engineeringInterfacePersonIds.split(","))); } - String engineerAttSetIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineerAttSet())) - .map(ProjectRelatedPersonnel::getEngineerAttSet).collect(Collectors.joining(",")); + String engineerAttSetIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineerAttSet) + .filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(",")); if(StringUtils.isNotEmpty(engineerAttSetIds)){ userIdList.addAll(Arrays.asList(engineerAttSetIds.split(","))); } - String engineerLawSetIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineerLawSet())) - .map(ProjectRelatedPersonnel::getEngineerLawSet).collect(Collectors.joining(",")); + String engineerLawSetIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineerLawSet) + .filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(",")); if(StringUtils.isNotEmpty(engineerLawSetIds)){ userIdList.addAll(Arrays.asList(engineerLawSetIds.split(","))); } if(CollectionUtils.isNotEmpty(userIdList)){ + userIdList = userIdList.stream().filter(userId -> StringUtils.isNotEmpty(userId)).collect(Collectors.toList()); List engineeringInterfacePersonList = this.sysUserService.querySysUserListByIdList(userIdList); if(CollectionUtils.isNotEmpty(engineeringInterfacePersonList)){ for (SysUser engineeringInterfacePerson : engineeringInterfacePersonList) {