From 9bc32befe68bc2754298308d01a44d24e03a5373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Mon, 17 Jul 2023 09:53:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java  | 4 ++++
 .../com/njcn/process/service/impl/SupvPlanServiceImpl.java  | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java
index 12e54f065..c44d119f5 100644
--- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java
+++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java
@@ -157,6 +157,8 @@ public class SupvPlanVO {
 
     private String createBy;
 
+    private String updateBy;
+
     /**
      * 实施状态
      */
@@ -164,4 +166,6 @@ public class SupvPlanVO {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
+
+
 }
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java
index be59634c2..6112724a8 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java
@@ -184,7 +184,7 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
 
         Page<SupvPlan> page = this.page(new Page<>(PageFactory.getPageNum(supvPlanParam), PageFactory.getPageSize(supvPlanParam)), lambdaQueryWrapper);
         List<SupvPlanVO> supvPlanVOList = BeanUtil.copyToList(page.getRecords(), SupvPlanVO.class);
-        List<String> userIds = supvPlanVOList.stream().map(SupvPlanVO::getCreateBy).distinct().collect(Collectors.toList());
+        List<String> userIds = supvPlanVOList.stream().map(SupvPlanVO::getUpdateBy).distinct().collect(Collectors.toList());
         supvPlanVOList.forEach(item -> {
             PvTerminalTreeVO pvTerminalTreeVO = null;
             if (mapCode.containsKey(item.getSupvOrgId())) {
@@ -231,8 +231,8 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
             List<User> userList = userFeignClient.getUserByIdList(userIds).getData();
             Map<String, User> map = userList.stream().collect(Collectors.toMap(User::getId, Function.identity()));
 
-            if (map.containsKey(item.getCreateBy())) {
-                item.setCreateBy(map.get(item.getCreateBy()).getName());
+            if (map.containsKey(item.getUpdateBy())) {
+                item.setCreateBy(map.get(item.getUpdateBy()).getName());
             }