From 8899f2b467dbf02f93d6e3a0bfd4ae81f5370503 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Mon, 5 Jun 2023 19:33:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
index c65e4b8..fe16e32 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
@@ -369,7 +369,7 @@ public class TodoCenterManage {
                 //通过审核后 所处理的逻辑
                 handlerManage.afterPassTodo(declaredProject,instance);
 
-                return findNextTaskId(instance,employeeCode,nodeId);
+                return findNextTaskId(instance,employeeCode,nodeId,param.getTaskId());
             // 驳回
             case REJECT:
                 //前置判断前端传的taskId是否存在不存在的情况 有可能是 或签被别人审批掉了
@@ -425,7 +425,7 @@ public class TodoCenterManage {
                     //上个审批人处理逻辑
                     processTaskService.lastWithdrawTask(param);
 
-                    return findNextTaskId(instance,employeeCode,nodeId);
+                    return findNextTaskId(instance,employeeCode,nodeId,param.getTaskId());
                 }
                 break;
             default:
@@ -1252,7 +1252,7 @@ public class TodoCenterManage {
      * @param instance
      * @return
      */
-    private String findNextTaskId(HistoricProcessInstance instance,String employeeCode,String nodeId) {
+    private String findNextTaskId(HistoricProcessInstance instance,String employeeCode,String nodeId,String taskId) {
         BpmnModel bpmnModel = repositoryService.getBpmnModel(instance.getProcessDefinitionId());
         Map<String, String> subNodeMap = ProcessTaskUtils.getSubNodeMap(bpmnModel);
         String subProcessId = subNodeMap.get(nodeId);
@@ -1267,7 +1267,7 @@ public class TodoCenterManage {
                 .asc()
                 .list();
         if(CollUtil.isEmpty(tasks)){
-            return "处理成功";
+            return taskId;
         }
         return tasks.get(0).getId();
     }