From 58c7fc55fa962c2a15f4c72fc9d3bd999027cafe Mon Sep 17 00:00:00 2001
From: songgaoshuai <1742057357@qq.com>
Date: Tue, 6 Jun 2023 12:27:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A8=A1=E5=9E=8B=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=A0=A1=E9=AA=8C=EF=BC=8C=E6=B5=81=E7=A8=8B=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=88=A0=E9=99=A4=EF=BC=8C=E6=B5=81=E7=A8=8B=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=BF=80=E6=B4=BB=E6=8C=82=E8=B5=B7=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/workflow/service/impl/ActModelServiceImpl.java   | 4 ----
 .../service/impl/ActProcessDefinitionServiceImpl.java        | 5 +++--
 2 files changed, 3 insertions(+), 6 deletions(-)

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 573f433c6..7257f55e7 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
@@ -221,10 +221,6 @@ public class ActModelServiceImpl implements IActModelService {
             if (ArrayUtil.isEmpty(xmlBytes)) {
                 throw new ServiceException("模型不能为空！");
             }
-            byte[] toXmlBytes = WorkflowUtils.bpmnJsonToXmlBytes(xmlBytes);
-            if (ArrayUtil.isEmpty(toXmlBytes)) {
-                throw new ServiceException("模型不能为空，请至少设计一条主线流程！");
-            }
             repositoryService.addModelEditorSource(model.getId(), xmlBytes);
             return true;
         } catch (Exception e) {
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
index 046c2b829..396e2aacb 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
@@ -181,7 +181,8 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
     @Override
     public boolean deleteDeployment(String deploymentId, String processDefinitionId) {
         try {
-            List<HistoricTaskInstance> taskInstanceList = historyService.createHistoricTaskInstanceQuery().processDefinitionId(processDefinitionId).list();
+            List<HistoricTaskInstance> taskInstanceList = historyService.createHistoricTaskInstanceQuery()
+                .processDefinitionId(processDefinitionId).list();
             if (CollectionUtil.isNotEmpty(taskInstanceList)) {
                 throw new ServiceException("当前流程定义已被使用不可删除！");
             }
@@ -203,7 +204,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
     public boolean updateProcessDefState(String processDefinitionId) {
         try {
             ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery()
-                .processDefinitionId(processDefinitionId).singleResult();
+                .processDefinitionId(processDefinitionId).processDefinitionTenantId(LoginHelper.getTenantId()).singleResult();
             //将当前为挂起状态更新为激活状态
             //参数说明：参数1：流程定义id,参数2：是否激活（true是否级联对应流程实例，激活了则对应流程实例都可以审批），
             //参数3：什么时候激活，如果为null则立即激活，如果为具体时间则到达此时间后激活