diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecJobActionServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecJobActionServiceImpl.java index 3723011e16a9384d300ad11762df8cb7851df3e4..f50f0da953b578fafa13e8d48a2a2de6e1f38b3e 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 0000000000000000000000000000000000000000..bd15b7d985a563cc4dbc8c905f249456ec9ac969 --- /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 0000000000000000000000000000000000000000..aeb7c995c9231b9b3faf6bd4a994db8875ccd531 --- /dev/null +++ b/src/main/resources/neatlogic/resources/autoexec/changelog/2025-05-22/version.json @@ -0,0 +1,12 @@ +{ + "content": [ + { + "type": "修复", + "detail": [ + { + "msg": "组合工具创建作业异常" + } + ] + } + ] +}