From 49e823817b0fd8d8825971e25dc2d926f77481a3 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Sun, 21 Nov 2021 17:24:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E6=97=A5bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SelectResponsibleUserAfter.java           |  6 +++++-
 .../UploadResearchResultAfter.java            | 20 +++++++++----------
 .../listener/standardRead/ResolveAfter.java   |  4 +++-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java
index 69114918..8ae4d975 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java
@@ -63,7 +63,11 @@ public class SelectResponsibleUserAfter implements TaskListener {
         }else {
             delegateTask.getVariable("responUserLists", List.class).addAll(strings);
         }
-        delegateTask.setVariable("datas",map);
+        if (null == delegateTask.getVariable("datas")) {
+            delegateTask.setVariable("datas", map);
+        }else {
+            delegateTask.getVariable("datas", Map.class).putAll(map);
+        }
 
 
         //截止时间 流程描述 创建人
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java
index cd4de4d5..40dd3e86 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java
@@ -40,20 +40,18 @@ public class UploadResearchResultAfter  implements TaskListener {
         JSONObject os=JSONObject.parseObject(String.valueOf(map.get(responUser)));
         for (int i = 0; i < responUserList.size(); i++) {
             JSONObject obj=responUserList.getJSONObject(i);
-            if(obj.getString("id").equals(responUser)
-                    &&obj.getString("dockUser").equals(os.getString("dockUser"))
-            ){
+                if (obj.getString("id").equals(responUser)
+                        && obj.getString("dockUser").equals(os.getString("dockUser"))) {
 
-                object.put("responUser",obj.getString("id"));
-                object.put("responUserName",obj.getString("name"));
-                obj.put("dyhz",object.getString("dyhz"));
-                obj.put("fileId",object.getString("fileId"));
-                obj.put("fileName",object.getString("fileName"));
+                    object.put("responUser", obj.getString("id"));
+                    object.put("responUserName", obj.getString("name"));
+                    obj.put("dyhz", object.getString("dyhz"));
+                    obj.put("fileId", object.getString("fileId"));
+                    obj.put("fileName", object.getString("fileName"));
 
-                responUserList.set(i,obj);
+                    responUserList.set(i, obj);
 
-                break;
-            }
+                }
         }
 
         delegateTask.setVariable("dockUsers",os.getString("dockUser"));
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
index bcb6ebac..67958b60 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
@@ -49,9 +49,11 @@ public class ResolveAfter implements TaskListener{
         }
         // 配置多实例
         delegateTask.setVariable("zrUserList", nextUserList);
-
+        //拆分标准 解读中情况下 也展示数据
         SarFileSplitInfoEO sarFileSplitInfoEO=new SarFileSplitInfoEO();
         sarFileSplitInfoEO.setSplitStatus("3");
+        sarFileSplitInfoEO.setStandNameSplit(object.getString("itemsName"));
+        sarFileSplitInfoEO.setStandNumSplit(object.getString("itemsNum"));
         sarFileSplitInfoEO.setId(object.getString("statusId"));
         delegateTask.setVariable("statusId",object.getString("statusId"));
         lawsUserInfoService.updateSarFileSplitInfo(sarFileSplitInfoEO);