From 7d61d29d953a50383a1d0647d76dc0371118ae05 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Thu, 26 Sep 2024 15:59:15 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-2924)=20-=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=8A=84=E9=80=81=E6=97=B6,=E5=A4=84=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E4=BB=BB=E5=8A=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomServiceTaskDelegateExpressionActivityBehavior.java  | 2 +-
 ...owEnginApplication.java => WorkflowEngineApplication.java} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename workflow-engine-server/src/main/java/cn/axzo/workflow/server/{WorkflowEnginApplication.java => WorkflowEngineApplication.java} (88%)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/behavior/CustomServiceTaskDelegateExpressionActivityBehavior.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/behavior/CustomServiceTaskDelegateExpressionActivityBehavior.java
index 96f01cfaf..a2c26ba4b 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/behavior/CustomServiceTaskDelegateExpressionActivityBehavior.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/behavior/CustomServiceTaskDelegateExpressionActivityBehavior.java
@@ -90,7 +90,7 @@ public class CustomServiceTaskDelegateExpressionActivityBehavior extends Service
             eventDispatcher.dispatchEvent(new ExtTaskInstUpdateEvent(execution.getProcessInstanceId(),
                     execution.getCurrentActivityId(), serviceTask.getId(), APPROVED),
                 processEngineConfiguration.getEngineCfgKey());
-            TaskHelper.deleteTask(serviceTask, "", false, false, false);
+            TaskHelper.deleteTask(serviceTask, "complete carbon", false, true, true);
         } else {
             log.warn("ServiceTask is null, executionId: {}, activityId: {}", execution.getId(),
                 execution.getCurrentActivityId());
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/WorkflowEnginApplication.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/WorkflowEngineApplication.java
similarity index 88%
rename from workflow-engine-server/src/main/java/cn/axzo/workflow/server/WorkflowEnginApplication.java
rename to workflow-engine-server/src/main/java/cn/axzo/workflow/server/WorkflowEngineApplication.java
index 1e1d7729a..a05fdf236 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/WorkflowEnginApplication.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/WorkflowEngineApplication.java
@@ -16,9 +16,9 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication(exclude = RabbitAutoConfiguration.class)
 @EnableTransactionManagement
 @EnableCaching
-public class WorkflowEnginApplication {
+public class WorkflowEngineApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(WorkflowEnginApplication.class, args);
+        SpringApplication.run(WorkflowEngineApplication.class, args);
     }
 }