Merge branch 'fix_foton_20230613' into 'master'

Fix foton 20230613

See merge request laws-foton-slrs/foton-wkflow-rest!60

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java

@@ -34,9 +34,12 @@ public class BussLibrary5After implements TaskListener{
 
         QueryWrapper<Datas> 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<Datas> 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<String> nextUserList = new ArrayList();

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