From 12d3dc3f71f7f8b8bbc42a1f68cb7c033ec519ca Mon Sep 17 00:00:00 2001 From: wxyclub Date: Wed, 10 Apr 2024 18:02:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=8AgetOne=E6=8D=A2=E6=88=90list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/bussLibraryProduct/BLApplicantAfter.java | 8 +++++++- .../bussLibraryProduct/BussLibraryProduct10After.java | 8 +++++++- .../bussLibraryProduct/BussLibraryProduct11After.java | 8 +++++++- .../bussLibraryProduct/BussLibraryProduct12After.java | 8 +++++++- .../bussLibraryProduct/BussLibraryProduct13After.java | 9 ++++++++- .../bussLibraryProduct/BussLibraryProduct14After.java | 10 +++++++++- .../bussLibraryProduct/BussLibraryProduct2After.java | 8 +++++++- .../bussLibraryProduct/BussLibraryProduct3After.java | 8 +++++++- .../bussLibraryProduct/BussLibraryProduct4After.java | 8 +++++++- .../bussLibraryProduct/BussLibraryProduct5After.java | 8 +++++++- .../bussLibraryProduct/BussLibraryProduct6After.java | 8 +++++++- .../bussLibraryProduct/BussLibraryProduct7After.java | 8 +++++++- .../bussLibraryProduct/BussLibraryProduct8After.java | 8 +++++++- .../bussLibraryProduct/BussLibraryProduct9After.java | 8 +++++++- .../bussLibraryProduct/BussLibraryProductC3After.java | 8 +++++++- .../bussLibraryProduct/BussLibraryProductC6After.java | 8 +++++++- 16 files changed, 115 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BLApplicantAfter.java index edc9ac1e..9f8d75f9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BLApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BLApplicantAfter.java @@ -13,6 +13,7 @@ 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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.tomcat.util.digester.ArrayStack; @@ -35,7 +36,12 @@ public class BLApplicantAfter implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (CollectionUtils.isEmpty(datasList)) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + Datas datas = datasList.get(0); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject form = null; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java index 731c6917..94a61242 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java @@ -12,6 +12,7 @@ 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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.ObjectUtils; @@ -31,7 +32,12 @@ public class BussLibraryProduct10After implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (CollectionUtils.isEmpty(datasList)) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + Datas datas = datasList.get(0); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct11After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct11After.java index 3dc674e1..0d271ce7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct11After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct11After.java @@ -12,6 +12,7 @@ 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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; @@ -30,7 +31,12 @@ public class BussLibraryProduct11After implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (CollectionUtils.isEmpty(datasList)) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + Datas datas = datasList.get(0); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct12After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct12After.java index 255cb7fd..57dee4c8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct12After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct12After.java @@ -12,6 +12,7 @@ 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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; @@ -30,7 +31,12 @@ public class BussLibraryProduct12After implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (CollectionUtils.isEmpty(datasList)) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + Datas datas = datasList.get(0); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject form = null; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java index d8f5c584..0e679db0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java @@ -10,8 +10,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; 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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.text.SimpleDateFormat; @@ -32,7 +34,12 @@ public class BussLibraryProduct13After implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (CollectionUtils.isEmpty(datasList)) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + Datas datas = datasList.get(0); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct14After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct14After.java index ec6e97b7..6aa12ce0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct14After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct14After.java @@ -9,12 +9,15 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; 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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; /** * 抄送后 @@ -28,7 +31,12 @@ public class BussLibraryProduct14After implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (CollectionUtils.isEmpty(datasList)) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + Datas datas = datasList.get(0); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct2After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct2After.java index 36094d25..6baf9ebd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct2After.java @@ -13,6 +13,7 @@ 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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.text.SimpleDateFormat; @@ -32,7 +33,12 @@ public class BussLibraryProduct2After implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (CollectionUtils.isEmpty(datasList)) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + Datas datas = datasList.get(0); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct3After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct3After.java index 095d2397..f44a089f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct3After.java @@ -12,6 +12,7 @@ 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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.text.SimpleDateFormat; @@ -31,7 +32,12 @@ public class BussLibraryProduct3After implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (CollectionUtils.isEmpty(datasList)) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + Datas datas = datasList.get(0); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct4After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct4After.java index 0913ac3f..544f6fba 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct4After.java @@ -12,6 +12,7 @@ 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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; @@ -30,7 +31,12 @@ public class BussLibraryProduct4After implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (CollectionUtils.isEmpty(datasList)) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + Datas datas = datasList.get(0); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java index b57666c9..5f483c0e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java @@ -14,6 +14,7 @@ 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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; @@ -31,7 +32,12 @@ public class BussLibraryProduct5After implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (CollectionUtils.isEmpty(datasList)) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + Datas datas = datasList.get(0); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct6After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct6After.java index 56231922..ee5e09b3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct6After.java @@ -12,6 +12,7 @@ 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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; @@ -29,7 +30,12 @@ public class BussLibraryProduct6After implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (CollectionUtils.isEmpty(datasList)) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + Datas datas = datasList.get(0); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java index 1ace828b..079d72f1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java @@ -12,6 +12,7 @@ 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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; @@ -30,7 +31,12 @@ public class BussLibraryProduct7After implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (CollectionUtils.isEmpty(datasList)) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + Datas datas = datasList.get(0); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java index 658ff74f..b5bb1eba 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java @@ -12,6 +12,7 @@ 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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.ObjectUtils; @@ -32,7 +33,12 @@ public class BussLibraryProduct8After implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (CollectionUtils.isEmpty(datasList)) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + Datas datas = datasList.get(0); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct9After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct9After.java index 3401895e..1a67d927 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct9After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct9After.java @@ -12,6 +12,7 @@ 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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; @@ -30,7 +31,12 @@ public class BussLibraryProduct9After implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (CollectionUtils.isEmpty(datasList)) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + Datas datas = datasList.get(0); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC3After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC3After.java index 350394c3..5cd662df 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC3After.java @@ -12,6 +12,7 @@ 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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.text.SimpleDateFormat; @@ -31,7 +32,12 @@ public class BussLibraryProductC3After implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (CollectionUtils.isEmpty(datasList)) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + Datas datas = datasList.get(0); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC6After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC6After.java index feae020c..e096cd5a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC6After.java @@ -12,6 +12,7 @@ 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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; @@ -29,7 +30,12 @@ public class BussLibraryProductC6After implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (CollectionUtils.isEmpty(datasList)) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + Datas datas = datasList.get(0); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object);