From ec913b776a7a541d576ecf35bab4b5ecc0c2fa6f Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 12 Dec 2023 11:19:16 +0800
Subject: [PATCH] =?UTF-8?q?fix=20-=20=E4=BF=AE=E5=A4=8D=E5=8A=A0=E7=AD=BE?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA=E6=93=8D=E4=BD=9C=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/service/impl/BpmnProcessTaskServiceImpl.java  | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
index dc8b3a42c..b89602d29 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
@@ -325,14 +325,6 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
         }
         saveAttachment(dto.getAttachmentList(), instance.getId(), task.getId());
 
-        // 完成任务，审批通过
-//        if (StringUtils.hasLength(task.getExecutionId())) {
-            taskService.complete(task.getId(), runtimeService.getVariables(task.getExecutionId()));
-//        } else {
-            //加签子任务 没有executionId
-//            taskService.complete(task.getId());
-//        }
-
         //add by zuoqinbo 处理加签[分为向前加签和向后加签]或转交的任务
         String parentTaskId = task.getParentTaskId();
         if (StringUtils.hasLength(parentTaskId)) {
@@ -360,6 +352,8 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
                 }
             }
         }
+        // 完成任务，审批通过
+        taskService.complete(task.getId(), runtimeService.getVariables(task.getExecutionId()));
     }
 
     private void recursionCompleteParentTask(String parentTaskId) {