sgb/zsw-farm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
小久哥
2022-06-17 16:29:58 +08:00
parent 4e8c2178ba
commit d662c8dec1
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java
+16 -11
View File
@@ -181,20 +181,25 @@ public class ProjectServiceImpl implements ProjectService {
//组装 项目成员信息
List<Long> memberIDList = new ArrayList<>();
projectListDTOList.forEach(item ->{
memberIDList.addAll(item.getMembers().toJavaList(Long.class));
if (ObjectUtil.isNotEmpty(item.getMembers())){
memberIDList.addAll(item.getMembers().toJavaList(Long.class));
}
});
memberIDList.stream().distinct().collect(Collectors.toList());
List<CpUserDO> cpUserList = cpUserMapper.selectList(Wrappers.<CpUserDO>lambdaQuery().in(CpUserDO::getId, memberIDList));
projectListDTOList.forEach(item ->{
List<CpUserDO> memberList = new ArrayList<>();
List<Long> projectMember = item.getMembers().toJavaList(Long.class);
cpUserList.forEach(user ->{
if (projectMember.contains(user.getId())){
memberList.add(user);
}
if (ObjectUtil.isNotEmpty(memberIDList)){
List<CpUserDO> cpUserList = cpUserMapper.selectList(Wrappers.<CpUserDO>lambdaQuery().in(CpUserDO::getId, memberIDList));
projectListDTOList.forEach(item ->{
List<CpUserDO> memberList = new ArrayList<>();
List<Long> projectMember = item.getMembers().toJavaList(Long.class);
cpUserList.forEach(user ->{
if (projectMember.contains(user.getId())){
memberList.add(user);
}
});
item.setMemberList(memberList);
});
item.setMemberList(memberList);
});
}
//任务完成的