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();