From 1a76289851b86ab97a026237ee2b39c161c6465c Mon Sep 17 00:00:00 2001 From: wxyclub Date: Fri, 28 Jul 2023 11:44:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=AB=8B=E9=A1=B9?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=B8=AD=E5=8F=91=E9=80=81OA=E4=BB=A3?= =?UTF-8?q?=E5=8A=9E=E8=BF=9E=E6=8E=A5=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java index ddb9369c..b4fc6252 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java @@ -31,7 +31,8 @@ public class Step2Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpgStep2?prcType=6"); +// one1.setLink("xmpgStep2?prcType=6"); + one1.setLink("qbzxdlxStep2?proType=26"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } From 2bb2e31db12209947da6ebc7f90763b42b8a0791 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Fri, 28 Jul 2023 14:16:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=9A=E6=9D=A1=E6=8A=8A=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/listener/bussLibrary/BussLibrary5After.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java index 24a90995..4605c27c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java @@ -34,9 +34,12 @@ public class BussLibrary5After implements TaskListener{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); - - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + queryWrapper.orderByDesc("CREATE_TIME"); + List datasList = datasService.list(queryWrapper); + if (datasList == null || datasList.isEmpty()) { + throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在"); + } + JSONObject object = JSONObject.parseObject(datasList.get(0).getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList();