From c576a9526712f9e23905f4eb47e22fdf15984176 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 2 Sep 2021 16:19:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4?= =?UTF-8?q?=E6=94=B9=20=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NonConformanceRectification/SelectDockUserAfter.java | 3 ++- .../NonConformanceRectification/SelectResponUserAfter.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserAfter.java index f32c7ea7..411880b5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserAfter.java @@ -47,7 +47,8 @@ public class SelectDockUserAfter implements TaskListener { JSONObject preDockUserOrg=(JSONObject)o; for (Object o1 : dockUserList) { JSONObject dockUser=(JSONObject)o1; - if(dockUser.getString("id").equals(preDockUserOrg.getString("id"))){ + if(dockUser.getString("id").equals(preDockUserOrg.getString("id")) && + object.getString("passInfo").equals("0")){ ok=false;break; } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java index 384bc3fd..86750b5d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java @@ -62,7 +62,7 @@ public class SelectResponUserAfter implements TaskListener { for (Object o1 : responUserList) { JSONObject responUser = (JSONObject) o1; if (responUser.getString("id").equals(preResponUser.get("id")) - && responUser.getString("dockUser").equals(delegateTask.getAssignee())) { + && responUser.getString("dockUser").equals(delegateTask.getAssignee()) && object.getString("passInfo").equals("0") ) { ok = false; break; }