From e10244d815fe52f48929df48907f578892e65d92 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 5 Nov 2021 09:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=90=8E=E8=A2=AB=E7=BB=A7=E7=BB=AD=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=97=A0=E6=B3=95=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../policyCommentProcess/EngineerReviewAfter.java        | 9 +++++++++
 .../listener/policyCommentProcess/FillCommentAfter.java  | 7 -------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java
index 4cdcd269..331be057 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java
@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.listener.policyCommentProcess;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -40,6 +41,14 @@ public class EngineerReviewAfter implements TaskListener {
             String lawsProveEngineer = JSONObject.parseObject(form.getString("form")).getString("lawsProveEngineerId");
             if(StringUtils.isNotBlank(lawsProveEngineer)){
 
+                JSONArray commentCollectionList =delegateTask.getVariable("commentCollectionList", JSONArray.class);
+                if (commentCollectionList==null) {
+                    commentCollectionList=new JSONArray();
+                }
+                commentCollectionList.addAll(object.getJSONArray("info"));
+                delegateTask.setVariable("commentCollectionList",commentCollectionList);
+
+
                 delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineer);
                 delegateTask.setVariable("lawsProveEngineerVerify",0);
 
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java
index c8fbf5a1..c774bc6a 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java
@@ -42,14 +42,7 @@ public class FillCommentAfter implements TaskListener {
         if(StringUtils.isNotBlank(responseDocker)){
 
 
-            JSONArray commentCollectionList =delegateTask.getVariable("commentCollectionList", JSONArray.class);
-            if (commentCollectionList==null) {
-                commentCollectionList=new JSONArray();
-            }
-            commentCollectionList.addAll(object.getJSONArray("info"));
 
-
-            delegateTask.setVariable("commentCollectionList",commentCollectionList);
             delegateTask.setVariable("responseDockerId",responseDocker);
             nextUserList= Arrays.asList(responseDocker.split(","));
             delegateTask.addCandidateUsers(nextUserList);