|
|
|
@ -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); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//任务完成的
|
|
|
|
|