From 90b4146a61a6cb8b4f75500c93732670200a3768 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 22 May 2025 10:20:34 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20error=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=8A=A5=E9=94=998?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1426664322465792]error日志报错8 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1426664322465792
---
 .../service/AutoexecJobActionServiceImpl.java        |  3 +--
 .../changelog/2025-05-22/neatlogic_tenant.sql        |  2 ++
 .../autoexec/changelog/2025-05-22/version.json       | 12 ++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 src/main/resources/neatlogic/resources/autoexec/changelog/2025-05-22/neatlogic_tenant.sql
 create mode 100644 src/main/resources/neatlogic/resources/autoexec/changelog/2025-05-22/version.json

diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecJobActionServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecJobActionServiceImpl.java
index 3723011e..f50f0da9 100644
--- a/src/main/java/neatlogic/module/autoexec/service/AutoexecJobActionServiceImpl.java
+++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecJobActionServiceImpl.java
@@ -64,7 +64,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
@@ -454,7 +453,7 @@ public class AutoexecJobActionServiceImpl implements AutoexecJobActionService, I
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    @Transactional
     public void validateCreateJob(AutoexecJobVo jobParam) throws Exception {
         validateAndCreateJobFromCombop(jobParam);
         jobParam.setAction(JobAction.FIRE.getValue());
diff --git a/src/main/resources/neatlogic/resources/autoexec/changelog/2025-05-22/neatlogic_tenant.sql b/src/main/resources/neatlogic/resources/autoexec/changelog/2025-05-22/neatlogic_tenant.sql
new file mode 100644
index 00000000..bd15b7d9
--- /dev/null
+++ b/src/main/resources/neatlogic/resources/autoexec/changelog/2025-05-22/neatlogic_tenant.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `autoexec_job_phase`
+    CHANGE `execute_policy` `execute_policy` ENUM ('first', 'middle', 'last') CHARSET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '执行策略';
\ No newline at end of file
diff --git a/src/main/resources/neatlogic/resources/autoexec/changelog/2025-05-22/version.json b/src/main/resources/neatlogic/resources/autoexec/changelog/2025-05-22/version.json
new file mode 100644
index 00000000..aeb7c995
--- /dev/null
+++ b/src/main/resources/neatlogic/resources/autoexec/changelog/2025-05-22/version.json
@@ -0,0 +1,12 @@
+{
+  "content": [
+    {
+      "type": "修复",
+      "detail": [
+        {
+          "msg": "组合工具创建作业异常"
+        }
+      ]
+    }
+  ]
+}
-- 
Gitee