From d4685e5f9594916ae20abee354ec7185a06a1125 Mon Sep 17 00:00:00 2001
From: songgaoshuai <1742057357@qq.com>
Date: 星期四, 07 三月 2024 15:42:32 +0800
Subject: [PATCH] add 添加撤销，终止，驳回，作废等状态校验
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
index 968ca91..700dab5 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
@@ -474,9 +474,7 @@
}
HistoricProcessInstance historicProcessInstance = QueryUtils.hisInstanceQuery()
.processInstanceBusinessKey(task.getProcessInstanceId()).singleResult();
- if (ObjectUtil.isNotEmpty(historicProcessInstance) && BusinessStatusEnum.TERMINATION.getStatus().equals(historicProcessInstance.getBusinessStatus())) {
- throw new ServiceException("璇ュ崟鎹凡缁堟锛�");
- }
+ BusinessStatusEnum.checkInvalidStatus(historicProcessInstance.getBusinessStatus());
try {
if (StringUtils.isBlank(terminationBo.getComment())) {
terminationBo.setComment(LoginHelper.getLoginUser().getNickname() + "缁堟浜嗙敵璇�");
@@ -654,6 +652,7 @@
if (BusinessStatusEnum.BACK.getStatus().equals(processInstance.getBusinessStatus())) {
throw new ServiceException("璇ュ崟鎹凡閫�鍥烇紒");
}
+ BusinessStatusEnum.checkBackStatus(processInstance.getBusinessStatus());
//鍒ゆ柇鏄惁鏈夊涓换鍔�
List<Task> taskList = QueryUtils.taskQuery(processInstanceId).list();
//鐢宠浜鸿妭鐐�
--
Gitblit v1.9.3