From 423b548c113aec9901538834b2a7f06a10b1dc03 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 27 Sep 2021 09:43:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/UserProjectResultServiceImpl.java     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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<UserProjectResultM
             throw new BaseException("此表单无有效反馈，不能导出");
         }
         List<PrUserProjectResultExtDTO> extList = prUserProjectResultExtDao.selectResultExtList(request.getProjectKey());
-
+        Map<String, PrUserProjectResultExtDTO> map = extList.stream().collect(Collectors.toMap(PrUserProjectResultExtDTO::getUserProjectResult, Function.identity()));
         List<Map<String, Object>> resultList = resultEntityList.stream().map(item -> {
             Map<String, Object> processData = item.getProcessData();
             Iterator<String> iterator = processData.keySet().iterator();
@@ -150,14 +151,13 @@ public class UserProjectResultServiceImpl extends ServiceImpl<UserProjectResultM
 
             processData.put(BaseEntity.Fields.createdTime, item.getCreatedTime());
             processData.put(UserProjectResultEntity.Fields.submitAddress, item.getSubmitAddress());
-            processData.put(PrUserProjectResultExtDTO.Fields.realName, "");
-            processData.put(PrUserProjectResultExtDTO.Fields.orgName, "");
-            extList.forEach(e->{
-                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<ExportProjectResultVO.ExcelHeader> allHeaderList = new ArrayList<>();