From c44c502d4ee9c3d3456c5100d0208d13a0572bb5 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 13 Jun 2024 11:07:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?-=E5=B7=A5=E5=8D=95=E5=BC=82=E5=B8=B8=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=B7=A5=E5=8D=95=E5=8F=96=E6=B6=88=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#[1178095397076992]IT服务-工单异常时，开放工单取消权限 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1178095397076992
---
 .../process/operationauth/handler/TaskOperateHandler.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java b/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java
index 5b7f6ce37..2c74a9bde 100644
--- a/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java
+++ b/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java
@@ -156,8 +156,8 @@ public class TaskOperateHandler extends OperationAuthHandlerBase {
                             ProcessTaskStatus.DRAFT,
                             ProcessTaskStatus.SUCCEED,
                             ProcessTaskStatus.ABORTED,
-                            ProcessTaskStatus.FAILED,
-                            ProcessTaskStatus.HANG,
+//                            ProcessTaskStatus.FAILED,
+//                            ProcessTaskStatus.HANG,
                             ProcessTaskStatus.SCORED);
                     if (exception != null) {
                         operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>())
-- 
Gitee


From 99ab5f2e1f6a5bcca1871b859757ee8dbe7499ae Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 13 Jun 2024 11:19:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?-=E5=B7=A5=E5=8D=95=E5=BC=82=E5=B8=B8=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=B7=A5=E5=8D=95=E5=8F=96=E6=B6=88=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#[1178095397076992]IT服务-工单异常时，开放工单取消权限 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1178095397076992
---
 .../process/operationauth/handler/TaskOperateHandler.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java b/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java
index 2c74a9bde..e5c73757a 100644
--- a/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java
+++ b/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java
@@ -164,8 +164,10 @@ public class TaskOperateHandler extends OperationAuthHandlerBase {
                                 .put(operationType, exception);
                         return false;
                     }
-                    // 工单状态为进行中的才能终止
-                    if (ProcessTaskStatus.RUNNING.getValue().equals(processTaskVo.getStatus())) {
+                    // 工单状态为进行中、异常、挂起时才能终止
+                    if (ProcessTaskStatus.RUNNING.getValue().equals(processTaskVo.getStatus())
+                            || ProcessTaskStatus.FAILED.getValue().equals(processTaskVo.getStatus())
+                            || ProcessTaskStatus.HANG.getValue().equals(processTaskVo.getStatus())) {
                         //系统用户默认拥有权限
                         if (SystemUser.SYSTEM.getUserUuid().equals(userUuid)) {
                             return true;
-- 
Gitee