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