From 3284dcd1a9ebe9a4889443f2809dce4918188132 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 27 Dec 2021 19:30:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=E9=83=A8=E9=97=A8=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E4=BA=BA=E5=92=8C=E9=83=A8=E9=95=BF=20=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E9=9C=80=E8=A6=81=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E4=B8=BA=E4=B8=80=E6=9D=A1=E5=BE=85=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/StandardSurvey/ResponUserSignAfter.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java index 7d0c452e..e7438949 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java @@ -96,10 +96,16 @@ public class ResponUserSignAfter implements TaskListener { count++; delegateTask.setVariable("task2OKCount",count); } - if(count>=delegateTask.getVariable("responUserLists",List.class).size()){ + if(count>=responUserList.size()){ if(delegateTask.getVariable("actionFlag",Integer.class)==0){ if(nextUserList != null && !nextUserList.isEmpty()){ - for(String nextUser : nextUserList){ + List res=new ArrayList<>(); + nextUserList.forEach(s -> { + if (!res.contains(s)){ + res.add(s); + } + }); + for(String nextUser : res){ BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); From 959a87edbd3490d2bb5222418bbfa1b57de306df Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 27 Dec 2021 20:00:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=9A=E7=AD=BE=E8=B5=B0=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/StandardCommentNewProcess/Step7After.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7After.java index c8931ef8..257ce4c7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7After.java @@ -58,9 +58,16 @@ public class Step7After implements TaskListener { if (delegateTask.getVariable("hqCount",Integer.class)==delegateTask.getVariable("responUserList",List.class).size()) { if (0 == delegateTask.getVariable("hqMark", Integer.class)) { prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-部长+对接人审批"; - nextUserList.addAll(delegateTask.getVariable("zrUserIdList",List.class)); + List strings=delegateTask.getVariable("zrUserIdList",List.class); + strings.forEach(s -> { + if (!nextUserList.contains(s)){ + nextUserList.add(s); + } + }); + delegateTask.setVariable("hqFlag","0"); } else { prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师汇总"; + delegateTask.setVariable("hqFlag","1"); } }