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; }