From 6d9cd8ffb4eb7d27a9542a6be53131968a11fcaf Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 4 Nov 2021 17:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E8=AE=B0=E6=B5=81=E7=A8=8B=E4=B8=BA?=
 =?UTF-8?q?=E4=BA=8B=E4=B8=9A=E9=83=A8=E8=BF=98=E6=98=AF=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E8=A7=84=E5=88=92=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionAfter.java                    | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java
index f1100089..ea7e09be 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java
@@ -36,31 +36,27 @@ public class DistributionAfter implements TaskListener {
         delegateTask.setVariable("objectJson",object);
 
         List<String> nextUserList = new ArrayList();
+        Map<String, String> departmentMap = new HashMap<>(); //用户--用户所属部门
 
 
         if(StringUtils.isNotBlank(object.getString("responUserList"))){
             nextUserList= Arrays.asList(object.getString("responUserList").split(","));
 
+            JSONArray mapArray = object.getJSONArray("responUserAndInstitutionNameMap");
+            for (Object jsonMap : mapArray) {
+                departmentMap.putAll(JSONObject.parseObject(jsonMap.toString(), Map.class));
+
+            }
             // 配置多实例
             delegateTask.setVariable("commentUserList",nextUserList);
             delegateTask.addCandidateUsers(nextUserList);
         }
 
-        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 < nextUserList.size(); i++) {
-            JSONObject json=new JSONObject();
-            json.put("id",nextUserList.get(i));
-            json.put("name",nextUserList.get(i));
-            json.put("dockUser",delegateTask.getAssignee());
-            json.put("info",new JSONArray());
-            userListJson.add(json);
-            strings.add(nextUserList.get(i));
-            map.put(nextUserList.get(i),json);
-        }
+        JSONArray commentCollectionList=delegateTask.getVariable("commentCollectionList",JSONArray.class);
+        if (commentCollectionList==null) commentCollectionList=new JSONArray();
+        delegateTask.setVariable("commentCollectionList",commentCollectionList);
+
 
 
 
@@ -97,10 +93,14 @@ public class DistributionAfter implements TaskListener {
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){
+                //标记此用户是事业部还是产品规划部
+                JSONObject repositoryObject =object;
+                repositoryObject.put("department",departmentMap.get(nextUser));
+
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setMesg(repositoryObject.toJSONString());
                 busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
                 busProcessNewNext.setTaskInfo(delegateTask.getName());