From 8c25d0680eab696851fcbd0efeac37c5d8a33476 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Sat, 18 Jun 2022 14:42:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9--=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/NcrTrackServiceImpl.java     | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
index a2e713672..b32f22693 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
@@ -34,10 +34,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -75,9 +76,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
             ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("*",""));
         }
 //        List<SysUser> sysUserList = sysUserService.list();
-        QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.select("id", "username");
-        List<SysUser> sysUserList = this.sysUserService.list(userQueryWrapper);
+
 
         ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue());
         ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue());
@@ -97,6 +96,25 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
             verifyName = "Verify conformance validation";
         }
         List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
+        Set<String> userIdSet = new HashSet<>();
+        for (NcrTrackVO trackVO : infoList) {
+            if(StringUtils.isNotBlank(trackVO.getDesignInitiatorId())){
+                userIdSet.add(trackVO.getDesignInitiatorId());
+            }
+            if(StringUtils.isNotBlank(trackVO.getPrehomoInitiatorId())){
+                userIdSet.add(trackVO.getPrehomoInitiatorId());
+            }
+            if(StringUtils.isNotBlank(trackVO.getVerifyInitiatorId())){
+                userIdSet.add(trackVO.getVerifyInitiatorId());
+            }
+        }
+        List<SysUser> sysUserList = new ArrayList<>();
+        if(userIdSet.size() != 0){
+            QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
+            userQueryWrapper.lambda().in(SysUser::getId,userIdSet);
+            userQueryWrapper.select("id", "username");
+            sysUserList = this.sysUserService.list(userQueryWrapper);
+        }
         for (NcrTrackVO trackVO : infoList) {
             //责任领域中英文切换
             if(StringUtils.isNotBlank(trackVO.getDutyTerritory())){