diff --git a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java index 789ba72d..9387da83 100644 --- a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java @@ -452,6 +452,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService { demandExtraMap = demandExtraList.stream().collect(Collectors.groupingBy(SpdmDemandExtraVo::getDemandId)); } for (SpdmDemandVo spdmDemandVo : demandList) { + spdmDemandVo.setExtras(demandExtraMap.get(spdmDemandVo.getUuid())); eachTaskList = taskMap.get(spdmDemandVo.getUuid()); spdmDemandVo.setProgress(CollectionUtils.isEmpty(eachTaskList) ? 0 : eachTaskList.stream().mapToInt(SpdmTaskVo::getProgress).sum() / eachTaskList.size()); if (StringUtils.isNotBlank(spdmDemandVo.getProjectId())) { @@ -478,7 +479,6 @@ public class DemandServiceImpl extends BaseService implements IDemandService { } } spdmDemandVo.setEMemberList(spdmEUserVoList); - spdmDemandVo.setExtras(demandExtraMap.get(spdmDemandVo.getUuid())); } jsonObject.put("data", demandList); return SdmResponse.success(jsonObject);