From 2345efa42877e2f57a66b189f36568a93f37ab84 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Tue, 22 Mar 2022 10:51:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E8=A1=8C=E8=A7=A3=E5=86=B3=20?=
 =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E4=B8=A2=E4=BA=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wkflow/listener/standardRead/ResolveAfter.java   |  1 +
 .../wkflow/listener/standardRead/ZrApplayAfter.java  | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

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 c6acc07a..0c1b625b 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
@@ -62,6 +62,7 @@ public class ResolveAfter implements TaskListener{
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("applyUserId");
+        delegateTask.setVariable("userId",user);
         String username = object.getString("applyUserIdName");
         delegateTask.setVariable("createDate",new Date());
         String title=object.getString("itemsNum1")+"-"+object.getString("itemsName1");
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java
index f07c02f1..f7e02fb7 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java
@@ -44,10 +44,14 @@ public class ZrApplayAfter implements TaskListener{
         if(object.getString("resolveFlag").equals("1")){
             delegateTask.setVariable("zrFlag",1);
             prcName=prcName+"-工程师审核";
-            if(StringUtils.isNotBlank(object.getString("applyUserId"))){
-                delegateTask.setVariable("engineerUserId",object.getString("applyUserId"));
-                nextUserList.add(object.getString("applyUserId"));
-            }
+//            if(StringUtils.isNotBlank(object.getString("applyUserId"))){
+//                delegateTask.setVariable("engineerUserId",object.getString("applyUserId"));
+//                nextUserList.add(object.getString("applyUserId"));
+//            }
+//            if(StringUtils.isNotBlank(object.getString("applyUserId"))){
+                delegateTask.setVariable("engineerUserId",delegateTask.getVariable("userId",String.class));
+                nextUserList.add(delegateTask.getVariable("userId",String.class));
+//            }
         }else {
             prcName=prcName+"-填写解读分析";
             delegateTask.setVariable("zrFlag",2);