From 78e91de60933eaab51b2b105d18d4cffaf896163 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 6 Jun 2024 18:39:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B5=81=E7=A8=8B=E5=90=8D=E7=A7=B0=E5=87=BA?= =?UTF-8?q?=E7=8E=B0null=E7=9A=84=E6=83=85=E5=86=B5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bat/wkflow/listener/standardRead/ChooseZrAfter.java | 6 ++++++ .../bat/wkflow/listener/standardRead/DeptApplayAfter.java | 6 ++++++ .../ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java | 8 ++++++++ .../wkflow/listener/standardRead/EngineerApplayAfter.java | 6 ++++++ .../ydw/bat/wkflow/listener/standardRead/ExpainAfter.java | 6 ++++++ .../bat/wkflow/listener/standardRead/ZrApplayAfter.java | 6 ++++++ 6 files changed, 38 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java index d2f2979a..c2dc3ee8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java @@ -32,6 +32,12 @@ public class ChooseZrAfter implements TaskListener{ Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + // 线上可能出现表单多一层form的情况，这里去除多出的form + JSONObject form = object.getJSONObject("form"); + if (form != null) { + object.remove("form"); + object.putAll(form); + } delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); 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 9b0ebf05..5e4dc9cc 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 @@ -40,6 +40,12 @@ public class DeptApplayAfter implements TaskListener{ Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + // 线上可能出现表单多一层form的情况，这里去除多出的form + JSONObject form = object.getJSONObject("form"); + if (form != null) { + object.remove("form"); + object.putAll(form); + } delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java index e3287544..fb95c1b5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java @@ -15,6 +15,8 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -34,6 +36,12 @@ public class DeptZrAfter implements TaskListener{ Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + // 线上可能出现表单多一层form的情况，这里去除多出的form + JSONObject form = object.getJSONObject("form"); + if (form != null) { + object.remove("form"); + object.putAll(form); + } delegateTask.setVariable("objectJson",object); //获取全局变量里的数据 JSONArray responUserList = (delegateTask.getVariable("zxUserList", JSONArray.class)); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java index f987de1c..0de92a36 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java @@ -33,6 +33,12 @@ public class EngineerApplayAfter implements TaskListener{ Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + // 线上可能出现表单多一层form的情况，这里去除多出的form + JSONObject form = object.getJSONObject("form"); + if (form != null) { + object.remove("form"); + object.putAll(form); + } delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java index 534fa4a2..7bdfce22 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java @@ -30,6 +30,12 @@ public class ExpainAfter implements TaskListener{ Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + // 线上可能出现表单多一层form的情况，这里去除多出的form + JSONObject form = object.getJSONObject("form"); + if (form != null) { + object.remove("form"); + object.putAll(form); + } delegateTask.setVariable("objectJson",object); JSONArray responUserList = new JSONArray(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java index 1d4a6b70..2cca3c07 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java @@ -35,6 +35,12 @@ public class ZrApplayAfter implements TaskListener{ Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + // 线上可能出现表单多一层form的情况，这里去除多出的form + JSONObject form = object.getJSONObject("form"); + if (form != null) { + object.remove("form"); + object.putAll(form); + } delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList();