WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
wangzhijiang
2023-04-18 13:55:02 +08:00
parent 19aa110dc5
commit 91724e6816
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+7 -6
View File
@@ -1832,23 +1832,24 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
if(CollectionUtils.isNotEmpty(prpEoList)){ if(CollectionUtils.isNotEmpty(prpEoList)){
List<String> userIdList = new ArrayList<>(); List<String> userIdList = new ArrayList<>();
String engineeringInterfacePersonIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineeringInterfacePerson())) String engineeringInterfacePersonIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineeringInterfacePerson)
.map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).collect(Collectors.joining(",")); .filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(","));
if(StringUtils.isNotEmpty(engineeringInterfacePersonIds)){ if(StringUtils.isNotEmpty(engineeringInterfacePersonIds)){
userIdList.addAll(Arrays.asList(engineeringInterfacePersonIds.split(","))); userIdList.addAll(Arrays.asList(engineeringInterfacePersonIds.split(",")));
} }
String engineerAttSetIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineerAttSet())) String engineerAttSetIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineerAttSet)
.map(ProjectRelatedPersonnel::getEngineerAttSet).collect(Collectors.joining(",")); .filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(","));
if(StringUtils.isNotEmpty(engineerAttSetIds)){ if(StringUtils.isNotEmpty(engineerAttSetIds)){
userIdList.addAll(Arrays.asList(engineerAttSetIds.split(","))); userIdList.addAll(Arrays.asList(engineerAttSetIds.split(",")));
} }
String engineerLawSetIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineerLawSet())) String engineerLawSetIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineerLawSet)
.map(ProjectRelatedPersonnel::getEngineerLawSet).collect(Collectors.joining(",")); .filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(","));
if(StringUtils.isNotEmpty(engineerLawSetIds)){ if(StringUtils.isNotEmpty(engineerLawSetIds)){
userIdList.addAll(Arrays.asList(engineerLawSetIds.split(","))); userIdList.addAll(Arrays.asList(engineerLawSetIds.split(",")));
} }
if(CollectionUtils.isNotEmpty(userIdList)){ if(CollectionUtils.isNotEmpty(userIdList)){
userIdList = userIdList.stream().filter(userId -> StringUtils.isNotEmpty(userId)).collect(Collectors.toList());
List<SysUser> engineeringInterfacePersonList = this.sysUserService.querySysUserListByIdList(userIdList); List<SysUser> engineeringInterfacePersonList = this.sysUserService.querySysUserListByIdList(userIdList);
if(CollectionUtils.isNotEmpty(engineeringInterfacePersonList)){ if(CollectionUtils.isNotEmpty(engineeringInterfacePersonList)){
for (SysUser engineeringInterfacePerson : engineeringInterfacePersonList) { for (SysUser engineeringInterfacePerson : engineeringInterfacePersonList) {