From d435617e1897808d7a5e3ee6491f7b7d8a24a69f Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 10 Feb 2022 15:14:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardCommentNewProcess/Step1After.java | 2 +- .../Step4After.java | 46 ++++++++++--------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1After.java index 9feccfbd..932cbfe0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1After.java @@ -116,7 +116,7 @@ public class Step1After implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("责任对接人选择责任人"); + busProcessNewNext.setTaskInfo("意见反馈"); busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(delegateTask.getVariable("dockUser",String.class)); busBean.save(busProcessNewNext); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4After.java index 067668d3..5d161272 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4After.java @@ -54,17 +54,19 @@ public class Step4After implements TaskListener { if (null!=array && array.size()>0){ for (Object o:array) { JSONObject object1= JSON.parseObject(o.toString()); - if (null!=map.get(delegateTask.getAssignee()+"-"+object1.getString("implementerId"))){ - map.get(delegateTask.getAssignee()+"-"+object1.getString("implementerId")).getJSONArray("dataList").add(object1); - }else { - JSONObject object2=JSON.parseObject(object.toJSONString()); - JSONArray array1=new JSONArray(); - array1.add(object1); - object2.put("dataList",array1); - object2.put("keys",delegateTask.getAssignee()+"-"+object1.getString("implementerId")); - map.put(delegateTask.getAssignee()+"-"+object1.getString("implementerId"),object2); - nextUserList.add(object1.getString("implementerId")); - order.add(delegateTask.getAssignee()+"-"+object1.getString("implementerId")); + if (null!=object1.getString("implementerId") && !object1.getString("implementerId").isEmpty()) { + if (null != map.get(delegateTask.getAssignee() + "-" + object1.getString("implementerId"))) { + map.get(delegateTask.getAssignee() + "-" + object1.getString("implementerId")).getJSONArray("dataList").add(object1); + } else { + JSONObject object2 = JSON.parseObject(object.toJSONString()); + JSONArray array1 = new JSONArray(); + array1.add(object1); + object2.put("dataList", array1); + object2.put("keys", delegateTask.getAssignee() + "-" + object1.getString("implementerId")); + map.put(delegateTask.getAssignee() + "-" + object1.getString("implementerId"), object2); + nextUserList.add(object1.getString("implementerId")); + order.add(delegateTask.getAssignee() + "-" + object1.getString("implementerId")); + } } } } @@ -115,16 +117,18 @@ public class Step4After implements TaskListener { if (nextUserList != null && !nextUserList.isEmpty()) { int i=0; for (String nextUser : nextUserList) { - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(map.get(order.get(i)).toJSONString()); - busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(nextUser); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); + if (null!=nextUser && !nextUser.isEmpty()) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(map.get(order.get(i)).toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } i++; } }