From 424d9837a71bf9a8654a683a999a55be5f2c9228 Mon Sep 17 00:00:00 2001
From: daihw <928874202@qq.com>
Date: Mon, 22 May 2023 15:45:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=8B=E5=8A=A8=E7=BB=88=E6=AD=A2?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E4=B8=AD=E7=9A=84=E6=B5=81=E7=A8=8B=E5=AE=9E?=
 =?UTF-8?q?=E4=BE=8B=EF=BC=8C=E8=8A=82=E7=82=B9=E6=B2=A1=E6=9C=89=E7=BB=88?=
 =?UTF-8?q?=E6=AD=A2=EF=BC=8C=E4=B8=80=E7=9B=B4=E5=9C=A8=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=AD=E7=8A=B6=E6=80=81=20[https://gitee.com/jianmu-dev/jia?=
 =?UTF-8?q?nmu/issues/I6N7WK]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jianmu/api/eventhandler/AsyncTaskInstanceEventHandler.java | 3 ++-
 .../service/internal/WorkflowInstanceInternalApplication.java  | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/src/main/java/dev/jianmu/api/eventhandler/AsyncTaskInstanceEventHandler.java b/api/src/main/java/dev/jianmu/api/eventhandler/AsyncTaskInstanceEventHandler.java
index 3ab21ea16..75c5c88b1 100644
--- a/api/src/main/java/dev/jianmu/api/eventhandler/AsyncTaskInstanceEventHandler.java
+++ b/api/src/main/java/dev/jianmu/api/eventhandler/AsyncTaskInstanceEventHandler.java
@@ -162,7 +162,8 @@ public class AsyncTaskInstanceEventHandler {
         log.info("-----------------------------------------------------");
     }
 
-    @EventListener
+    @Async
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
     public void handleTaskFailedEvent(TaskFailedEvent event) {
         MDC.put("triggerId", event.getTriggerId());
         log.info("Get TaskFailedEvent here -------------------------");
diff --git a/application/src/main/java/dev/jianmu/application/service/internal/WorkflowInstanceInternalApplication.java b/application/src/main/java/dev/jianmu/application/service/internal/WorkflowInstanceInternalApplication.java
index 1fbd6074c..791cbead5 100644
--- a/application/src/main/java/dev/jianmu/application/service/internal/WorkflowInstanceInternalApplication.java
+++ b/application/src/main/java/dev/jianmu/application/service/internal/WorkflowInstanceInternalApplication.java
@@ -190,7 +190,6 @@ public class WorkflowInstanceInternalApplication {
     }
 
     // 终止流程
-    @Async
     @Transactional
     public void terminate(String instanceId) {
         var workflowInstance = this.workflowInstanceRepository.findById(instanceId)
@@ -201,7 +200,7 @@ public class WorkflowInstanceInternalApplication {
         MDC.put("triggerId", workflowInstance.getTriggerId());
         workflowInstance.terminate();
         this.workflowInstanceRepository.save(workflowInstance);
-        if (projectLastExecution.getStatus() == ProcessStatus.TERMINATED.name()) {
+        if (projectLastExecution.getStatus().equals(ProcessStatus.TERMINATED.name())) {
             log.warn("流程实例已终止，无需终止");
             return;
         }
-- 
Gitee