From dd54cc972a251112359d1d8acbdce8cd3221ffd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Tue, 14 Jan 2025 14:12:19 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=90=8D=E4=B9=A6=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/system/service/impl/SysTenantServiceImpl.java | 2 +- .../java/org/dromara/workflow/common/ConditionalOnEnable.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java index 5e5e8cd20..2496e0a7d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java @@ -196,7 +196,7 @@ public class SysTenantServiceImpl implements ISysTenantService { configMapper.insertBatch(sysConfigList); // 未开启工作流不执行下方操作 - if (SpringUtils.getProperty("workflow.enabled", Boolean.class, false)) { + if (SpringUtils.getProperty("work-flow.enabled", Boolean.class, false)) { WorkflowService workflowService = SpringUtils.getBean(WorkflowService.class); // 新增租户流程定义 workflowService.syncDef(tenantId); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java index 8adf0158b..e04426496 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java @@ -9,6 +9,6 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE, ElementType.METHOD }) -@ConditionalOnProperty(value = "workflow.enabled", havingValue = "true") +@ConditionalOnProperty(value = "work-flow.enabled", havingValue = "true") public @interface ConditionalOnEnable { }