diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java index 4e2bd17..da9829b 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java @@ -40,6 +40,7 @@ import org.springframework.stereotype.Service; import java.io.File; import java.io.FileInputStream; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; import static com.tduck.cloud.project.constant.ProjectRedisKeyConstants.PROJECT_RESULT_NUMBER; @@ -136,7 +137,7 @@ public class UserProjectResultServiceImpl extends ServiceImpl extList = prUserProjectResultExtDao.selectResultExtList(request.getProjectKey()); - + Map map = extList.stream().collect(Collectors.toMap(PrUserProjectResultExtDTO::getUserProjectResult, Function.identity())); List> resultList = resultEntityList.stream().map(item -> { Map processData = item.getProcessData(); Iterator iterator = processData.keySet().iterator(); @@ -150,14 +151,13 @@ public class UserProjectResultServiceImpl extends ServiceImpl{ - if(e.getUserProjectResult().equals(item.getId())){ - processData.put(PrUserProjectResultExtDTO.Fields.realName, e.getRealName()); - processData.put(PrUserProjectResultExtDTO.Fields.orgName, e.getOrgName()); - } - }); + if (map.containsKey(item.getId())) { + processData.put(PrUserProjectResultExtDTO.Fields.realName, map.get(item.getId()).getRealName()); + processData.put(PrUserProjectResultExtDTO.Fields.orgName, map.get(item.getId()).getOrgName()); + } else { + processData.put(PrUserProjectResultExtDTO.Fields.realName, ""); + processData.put(PrUserProjectResultExtDTO.Fields.orgName, ""); + } return processData; }).collect(Collectors.toList()); List allHeaderList = new ArrayList<>();