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-15 16:46:05 +08:00
parent bf6e358524 345f480b1d
commit 26708a15da
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java
View File

@@ -352,9 +352,9 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
demandList = demandList.stream().filter(demand -> jobNumber.equals(demand.getCreator())).toList();
} else {
// 仿真负责人是当前用户
demandMemberVoList = demandMemberVoList.stream().filter(member -> MemberTypeEnum.PRINCIPAL.getCode().equals(member.getType()) && Long.valueOf(jobNumber).equals(member.getUserId())).toList();
if (CollectionUtils.isNotEmpty(demandMemberVoList)) {
List<String> myDemandIdList = demandMemberVoList.stream().map(SpdmDemandMemberVo::getDemandId).toList();
List<SpdmDemandMemberVo> pDemandMemberVoList = demandMemberVoList.stream().filter(member -> MemberTypeEnum.PRINCIPAL.getCode().equals(member.getType()) && Long.valueOf(jobNumber).equals(member.getUserId())).toList();
if (CollectionUtils.isNotEmpty(pDemandMemberVoList)) {
List<String> myDemandIdList = pDemandMemberVoList.stream().map(SpdmDemandMemberVo::getDemandId).toList();
demandList = demandList.stream().filter(demand -> myDemandIdList.contains(demand.getUuid())).toList();
}
}