From 6471d5360739e5ea05a5d14aef4bc69de7f5de9c Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 23 Feb 2023 14:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=AE=9E=E4=BE=8B?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/pmapi/sys/controller/ProcdefController.java  |  3 +++
 .../pmapi/todocenter/manage/TodoCenterManage.java           | 13 ++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/ProcdefController.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/ProcdefController.java
index cf0e5bf..8a6b16a 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/ProcdefController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/ProcdefController.java
@@ -1,7 +1,10 @@
 package com.ningdatech.pmapi.sys.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.ningdatech.basic.model.PageVo;
 import com.wflow.bean.dto.WflowModelHistorysDto;
+import com.wflow.bean.vo.WflowFormVo;
 import com.wflow.bean.vo.WflowModelVo;
 import com.wflow.service.ModelGroupService;
 import com.wflow.workflow.service.ProcessModelService;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
index f882b27..afb6013 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
@@ -810,9 +810,7 @@ public class TodoCenterManage {
         Map<String, ProcessInstanceUserDto> userMap = userInfoService.getUserMapByIds(userSet);
 
         // 装配节点审核人员信息
-        for (ProgressNode progressNode : progressInfo) {
-            progressNode.setUser(userMap.get(progressNode.getUserId()));
-        }
+        buildUser(progressInfo,userMap);
 
         ProcessProgressDetailVo res = new ProcessProgressDetailVo();
         res.setProcessProgressVo(progressInstanceDetail);
@@ -820,6 +818,15 @@ public class TodoCenterManage {
         return res;
     }
 
+    private void buildUser(List<ProgressNode> progressInfo,Map<String, ProcessInstanceUserDto> userMap) {
+        for (ProgressNode progressNode : progressInfo) {
+            progressNode.setUser(userMap.get(progressNode.getUserId()));
+            if(CollUtil.isNotEmpty(progressNode.getChildren())){
+                buildUser(progressNode.getChildren(),userMap);
+            }
+        }
+    }
+
     /**
      * 待办中心我已处理项目列表查询
      *