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

fix[project]: 修改查询团队成员接口

Browse Source
This commit is contained in:
lidongyang
2026-04-17 17:01:15 +08:00
parent 1d242c7da1
commit 19c7553eb1
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
View File

@@ -2045,13 +2045,16 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
List<Long> userIdList = spdmNodeMemberVoList.stream().map(SpdmNodeMemberVo::getUserId).distinct().collect(Collectors.toList());
// 查询node节点下的task的成员（仿真负责人和执行人）
List<SimulationTask> taskList = simulationTaskService.lambdaQuery().in(SimulationTask::getNodeId, allNodeIdList).list();
if (CollectionUtils.isNotEmpty(taskList)) {
List<SimulationTaskMember> taskMemberList = simulationTaskMemberService.lambdaQuery().in(SimulationTaskMember::getTaskId, taskList.stream().map(SimulationTask::getUuid).toList()).list();
if (CollectionUtils.isNotEmpty(taskMemberList)) {
userIdList.addAll(taskMemberList.stream().map(SimulationTaskMember::getUserId).distinct().toList());
if (userType != NodeMemberTypeEnum.PARTICIPANT.getCode()) {
List<SimulationTask> taskList = simulationTaskService.lambdaQuery().in(SimulationTask::getNodeId, allNodeIdList).list();
if (CollectionUtils.isNotEmpty(taskList)) {
List<SimulationTaskMember> taskMemberList = simulationTaskMemberService.lambdaQuery().in(SimulationTaskMember::getTaskId, taskList.stream().map(SimulationTask::getUuid).toList()).list();
if (CollectionUtils.isNotEmpty(taskMemberList)) {
userIdList.addAll(taskMemberList.stream().map(SimulationTaskMember::getUserId).distinct().toList());
}
}
}
userIdList = userIdList.stream().distinct().toList();
// SdmResponse<List<CIDUserResp>> cidUserResp = sysUserFeignClient.listUserByIds(UserQueryReq.builder().userIds(userIdList).build());
@@ -5266,12 +5269,15 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
expUserIdList = expUserIdList.stream().distinct().toList();
String errorMsg = "";
List<String> expUserNameList = new ArrayList<>();
log.info("expUserIdList为：{}",expUserIdList);
SdmResponse<List<CIDUserResp>> cidUserResp = sysUserFeignClient.listUserByIds(UserQueryReq.builder().userIds(expUserIdList).build());
List<CIDUserResp> userList = cidUserResp.getData();
log.info("userList为：{}",userList);
if (CollectionUtils.isNotEmpty(userList)) {
Map<Long, String> userMap = userList.stream().collect(Collectors.toMap(CIDUserResp::getUserId,CIDUserResp::getJobNumber,(oldVal,newVal) -> oldVal));
for (Long expUserId : expUserIdList) {
String userName = userMap.get(expUserId);
log.info("expUserId：{}的userName为：{}",expUserId,userName);
if (StringUtils.isBlank(userName)) {
expUserNameList.add(String.valueOf(expUserId));
}else {