toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
zhuxinru
2026-01-14 15:03:41 +08:00
parent 883dcbb292 5cc9d96f22
commit 4ce2c057cc
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
View File

@@ -369,8 +369,32 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
// 汇总任务进度、仿真负责人、执行人
for (ProjectNodePo projectNodePo : realTopProjectNodeList) {
summaryWorkspaceNode(projectNodePo,projectNodePo.getChildren());
projectNodePo.setPMemberList(projectNodePo.getPMemberList().stream().distinct().toList());
projectNodePo.setEMemberList(projectNodePo.getEMemberList().stream().distinct().toList());
List<CIDUserResp> pMemberList = projectNodePo.getPMemberList();
List<Long> pMemberIdList = new ArrayList<>();
List<CIDUserResp> distinctPMemberList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(pMemberList)) {
for (CIDUserResp cidUserResp : pMemberList) {
if (pMemberIdList.contains(cidUserResp.getUserId())) {
continue;
}
distinctPMemberList.add(cidUserResp);
pMemberIdList.add(cidUserResp.getUserId());
}
}
List<CIDUserResp> eMemberList = projectNodePo.getPMemberList();
List<Long> eMemberIdList = new ArrayList<>();
List<CIDUserResp> distinctEMemberList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(eMemberList)) {
for (CIDUserResp cidUserResp : eMemberList) {
if (eMemberIdList.contains(cidUserResp.getUserId())) {
continue;
}
distinctEMemberList.add(cidUserResp);
eMemberIdList.add(cidUserResp.getUserId());
}
}
projectNodePo.setPMemberList(distinctPMemberList);
projectNodePo.setEMemberList(distinctEMemberList);
}
return SdmResponse.success(realTopProjectNodeList.stream().flatMap(item -> item.getChildren().stream().filter(Objects::nonNull)).toList());
}