From 134e552d4e3897b052d73888aa864fddf81fac0f Mon Sep 17 00:00:00 2001
From: zj <1376702416@qq.com>
Date: Fri, 30 Jul 2021 17:36:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E6=B5=81=E7=A8=8B=20=EF=BC=81=EF=BC=81=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SelectResponsibleUserAfter.java           | 25 ++++++++++++-------
 .../UploadResearchResultAfter.java            |  6 ++---
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java
index 8c684df9..0353e8f6 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java
@@ -57,6 +57,9 @@ public class SelectResponsibleUserAfter implements TaskListener {
 
         JSONArray userListJson= JSON.parseArray(delegateTask.getVariable("responUserListInfo",String.class));
         if(userListJson==null)userListJson=new JSONArray();
+        List<String> strings=new ArrayList<>();
+        Map<String,JSONObject> map=new HashMap<>();
+
         for (int i = 0; i < responUserList.size()&&i<responUserListName.size(); i++) {
             JSONObject json=new JSONObject();
             json.put("id",responUserList.get(i));
@@ -64,6 +67,8 @@ public class SelectResponsibleUserAfter implements TaskListener {
             json.put("dockUser",delegateTask.getAssignee());
             json.put("info",new JSONArray());
             userListJson.add(json);
+            strings.add(responUserList.get(i));
+            map.put(responUserList.get(i),json);
         }
 
         delegateTask.setVariable("responUserListInfo",userListJson.toJSONString());
@@ -114,26 +119,28 @@ public class SelectResponsibleUserAfter implements TaskListener {
 
         if(selectResponCompletedCount>=dockUserList.size()){
 
-            Collection<Object> values = userListJson;
-            Collection<Map<String,Object>> respon=new ArrayList<>();
-            for (Object value : values) {
-                respon.add(((JSONObject)value).getInnerMap());
-            }
-            delegateTask.setVariable("zqazqazqaUserList",respon);
+//            Collection<Object> values = userListJson;
+//            Collection<Map<String,Object>> respon=new ArrayList<>();
+//            for (Object value : values) {
+//                respon.add(((JSONObject)value).getInnerMap());
+//            }
+            delegateTask.setVariable("zqazqazqaUserList",strings);
+            delegateTask.setVariable("datas",map);
 
 
             if(nextUserList != null && !nextUserList.isEmpty()){
                 List<BusProcessNew> busProcessNews=new ArrayList<>();
-                for(Map<String,Object> zqa : respon){
+                for(String zqa : strings){
                     BusProcessNew busProcessNewNext = new BusProcessNew();
                     busProcessNewNext.setMsgType("clause");
                     busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                    object.put("dockUser",(String)zqa.get("dockUser"));
+//                    object.put("dockUser",(String)zqa.get("dockUser"));
+                    object.put("dockUser",map.get(zqa).getString("dockUser"));
                     busProcessNewNext.setMesg(object.toJSONString());
                     busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                     busProcessNewNext.setFinishFlag("0");
                     busProcessNewNext.setTaskInfo(delegateTask.getName());
-                    busProcessNewNext.setUserId((String) zqa.get("id"));
+                    busProcessNewNext.setUserId(map.get(zqa).getString("id"));
                     busProcessNews.add(busProcessNewNext);
                 }
                 busBean.saveBatch(busProcessNews);
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java
index 33fdbfcb..9bc5dbff 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java
@@ -35,7 +35,6 @@ public class UploadResearchResultAfter  implements TaskListener {
 
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
 
-
         JSONArray responUserListInfo = JSON.parseArray(delegateTask.getVariable("responUserListInfo", String.class));
         for (int i=0;i<responUserListInfo.size();i++) {
             JSONObject jsonObject= (JSONObject) responUserListInfo.get(i);
@@ -61,8 +60,9 @@ public class UploadResearchResultAfter  implements TaskListener {
 
 
         delegateTask.setVariable("objectJson",object);
-
-
+        JSONObject jsonObject=JSONObject.parseObject(String.valueOf(delegateTask.getVariable("datas", Map.class).get(delegateTask.getVariable("responUser"))));
+        delegateTask.setVariable("dockUser",jsonObject.get("dockUser"));
+        nextUserList.add(String.valueOf(jsonObject.get("dockUser")));
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("startUser");