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 5d161272..ffdfa4cf 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 @@ -55,17 +55,34 @@ public class Step4After implements TaskListener { for (Object o:array) { JSONObject object1= JSON.parseObject(o.toString()); 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); + if (object1.getString("implementerId").contains(",")) { + for (String ss:object1.getString("implementerId").split(",")) { + if (null != map.get(delegateTask.getAssignee() + "-" + ss)) { + map.get(delegateTask.getAssignee() + "-" + ss).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() + "-" + ss); + map.put(delegateTask.getAssignee() + "-" + ss, object2); + nextUserList.add(ss); + order.add(delegateTask.getAssignee() + "-" + ss); + } + } } 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 != 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")); + } } } }