From 316b7ce8d210169b85bdeb442576c2a478821ab6 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 29 Dec 2021 10:43:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=95=B0=E6=8D=AE=E6=B6=88=E5=A4=B1=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardRead/DeptApplayAfter.java | 28 ++++++++++--------- .../listener/standardRead/ResolveAfter.java | 6 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index d7830822..a56670de 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -100,19 +100,21 @@ public class DeptApplayAfter implements TaskListener{ }); JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class)); - jsonArray1.forEach(obj ->{ - JSONObject object1 = JSONObject.parseObject(obj.toString()); - SarStandItems sarStandItems1=new SarStandItems(); - sarStandItems1.setFileType(delegateTask.getVariable("fileTypeOnly",String.class)); - sarStandItems1.setStandId(object.getString("standId")); - sarStandItems1.setItemsNum(object1.getString("itemsNum")); - sarStandItems1.setItemsName(object1.getString("itemsName")); - sarStandItems1.setResponsibleUnit(object1.getString("responsibleUnitShow")); - sarStandItems1.setDutyEngineer(object1.getString("zxUserIdName")); - sarStandItems1.setTermsConditions(object1.getString("itermsConditions")); - sarStandItems1.setReadContent(object1.getString("technicalRequir")); - sarStandItems.add(sarStandItems1); - }); + if (null!=jsonArray1 && jsonArray1.size()>0) { + jsonArray1.forEach(obj -> { + JSONObject object1 = JSONObject.parseObject(obj.toString()); + SarStandItems sarStandItems1 = new SarStandItems(); + sarStandItems1.setFileType(delegateTask.getVariable("fileTypeOnly", String.class)); + sarStandItems1.setStandId(object.getString("standId")); + sarStandItems1.setItemsNum(object1.getString("itemsNum")); + sarStandItems1.setItemsName(object1.getString("itemsName")); + sarStandItems1.setResponsibleUnit(object1.getString("responsibleUnitShow")); + sarStandItems1.setDutyEngineer(object1.getString("zxUserIdName")); + sarStandItems1.setTermsConditions(object1.getString("itermsConditions")); + sarStandItems1.setReadContent(object1.getString("technicalRequir")); + sarStandItems.add(sarStandItems1); + }); + } //标准状态修改 SarFileSplitInfoEO sarFileSplitInfoEO=new SarFileSplitInfoEO(); sarFileSplitInfoEO.setSplitStatus("4"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java index dfcc5f85..2b4cb602 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java @@ -99,13 +99,11 @@ public class ResolveAfter implements TaskListener{ // busBean.save(busProcessNew); if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ //2次 -// List listRes = userGroupMap.get(nextUser); -// object.put("itemList", JSON.toJSONString(listRes)); - + List listRes = userGroupMap.get(nextUser); + object.put("itemList", JSON.toJSONString(listRes)); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - //busProcessNewNext.setMesg(StringEscapeUtils.unescapeJavaScript(object.toJSONString()));//返转义函数 busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0");