diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
index 4d23bf033..718086b88 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
@@ -107,7 +107,9 @@ public class ActModelServiceImpl implements IActModelService {
             model.setVersion(version);
             model.setCategory(categoryCode);
             model.setMetaInfo(description);
-            model.setTenantId(TenantHelper.getTenantId());
+            if (TenantHelper.isEnable()) {
+                model.setTenantId(TenantHelper.getTenantId());
+            }
             //保存初始化的模型基本信息数据
             repositoryService.saveModel(model);
             repositoryService.addModelEditorSource(model.getId(), StrUtil.utf8Bytes(xml));
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
index a1cf0abd5..e937a8dff 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
@@ -70,7 +70,6 @@ public class WorkflowUtils {
             task = (TaskEntity) PROCESS_ENGINE.getTaskService().newTask();
             task.setCategory(currentTask.getCategory());
             task.setDescription(currentTask.getDescription());
-            task.setTenantId(currentTask.getTenantId());
             task.setAssignee(currentTask.getAssignee());
             task.setName(currentTask.getName());
             task.setProcessDefinitionId(currentTask.getProcessDefinitionId());
@@ -78,7 +77,9 @@ public class WorkflowUtils {
             task.setTaskDefinitionKey(currentTask.getTaskDefinitionKey());
             task.setPriority(currentTask.getPriority());
             task.setCreateTime(new Date());
-            task.setTenantId(TenantHelper.getTenantId());
+            if (TenantHelper.isEnable()) {
+                task.setTenantId(TenantHelper.getTenantId());
+            }
             PROCESS_ENGINE.getTaskService().saveTask(task);
         }
         if (ObjectUtil.isNotNull(task)) {
@@ -118,7 +119,9 @@ public class WorkflowUtils {
             actHiTaskinst.setProcDefId(processDefinitionId);
             actHiTaskinst.setProcInstId(processInstanceId);
             actHiTaskinst.setScopeType(TaskStatusEnum.COPY.getStatus());
-            actHiTaskinst.setTenantId(TenantHelper.getTenantId());
+            if (TenantHelper.isEnable()) {
+                actHiTaskinst.setTenantId(TenantHelper.getTenantId());
+            }
             LambdaUpdateWrapper<ActHiTaskinst> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.in(ActHiTaskinst::getId, taskIds);
             ACT_HI_TASKINST_MAPPER.update(actHiTaskinst, updateWrapper);