Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management

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;

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

@@ -555,9 +555,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);
@@ -565,6 +563,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);
+            }
+        }
+    }
+
     /**
      * 待办中心我已处理项目列表查询
      *