From 8803186d1cfa35aaa1f7d3f478d7739c28621d62 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 14 Feb 2025 16:43:01 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=9B=9E=E9=80=80-=E7=94=A8=E5=8E=9F=E6=AD=A5=E9=AA=A4?=
 =?UTF-8?q?=E7=9A=84=E6=9C=80=E5=90=8E=E5=A4=84=E7=90=86=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1334814911725568]工单回退-用原步骤的最后处理人 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1334814911725568
---
 .../process/service/ProcessStepHandlerUtil.java    | 13 ++++++-------
 .../process/service/ProcessTaskServiceImpl.java    | 14 ++++++--------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java
index 63d5700fe..cdfc819fe 100644
--- a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java
+++ b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java
@@ -23,6 +23,7 @@ import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.asynchronization.threadlocal.UserContext;
 import neatlogic.framework.asynchronization.threadpool.TransactionSynchronizationPool;
 import neatlogic.framework.common.constvalue.GroupSearch;
+import neatlogic.framework.config.ConfigManager;
 import neatlogic.framework.dao.mapper.UserMapper;
 import neatlogic.framework.exception.user.UserNotFoundException;
 import neatlogic.framework.form.attribute.core.FormAttributeDataConversionHandlerFactory;
@@ -40,8 +41,6 @@ import neatlogic.framework.process.dto.*;
 import neatlogic.framework.process.exception.processtask.*;
 import neatlogic.framework.process.operationauth.core.IOperationType;
 import neatlogic.framework.process.stepremind.core.IProcessTaskStepRemindType;
-import neatlogic.framework.process.workerpolicy.core.IWorkerPolicyHandler;
-import neatlogic.framework.process.workerpolicy.core.WorkerPolicyHandlerFactory;
 import neatlogic.framework.util.FormUtil;
 import neatlogic.module.process.dao.mapper.SelectContentByHashMapper;
 import neatlogic.module.process.dao.mapper.catalog.ChannelMapper;
@@ -375,11 +374,11 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess
         if (CollectionUtils.isEmpty(processTaskStepWorkerPolicyList)) {
             return true;
         }
-        int isOnlyOnceExecute = 0;
-        IWorkerPolicyHandler workerPolicyHandler = WorkerPolicyHandlerFactory.getHandler(WorkerPolicy.PRESTEPASSIGN.getValue());
-        if (workerPolicyHandler == null) {
-            isOnlyOnceExecute = workerPolicyHandler.isOnlyOnceExecute();
-        }
+        int isOnlyOnceExecute = Integer.parseInt(ConfigManager.getConfig(ItsmTenantConfig.PROCESSTASK_WORKERPOLICY_ISONLYONCEEXECUTE));
+//        IWorkerPolicyHandler workerPolicyHandler = WorkerPolicyHandlerFactory.getHandler(WorkerPolicy.PRESTEPASSIGN.getValue());
+//        if (workerPolicyHandler == null) {
+//            isOnlyOnceExecute = workerPolicyHandler.isOnlyOnceExecute();
+//        }
         for (ProcessTaskStepWorkerPolicyVo workerPolicyVo : processTaskStepWorkerPolicyList) {
             if (!WorkerPolicy.PRESTEPASSIGN.getValue().equals(workerPolicyVo.getPolicy())) {
                 continue;
diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java
index aedb33981..96811dfab 100644
--- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java
+++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java
@@ -22,8 +22,8 @@ import com.alibaba.fastjson.JSONPath;
 import neatlogic.framework.asynchronization.threadlocal.UserContext;
 import neatlogic.framework.change.constvalue.ChangeProcessStepHandlerType;
 import neatlogic.framework.common.constvalue.GroupSearch;
-import neatlogic.framework.common.constvalue.systemuser.SystemUser;
 import neatlogic.framework.common.constvalue.UserType;
+import neatlogic.framework.common.constvalue.systemuser.SystemUser;
 import neatlogic.framework.config.ConfigManager;
 import neatlogic.framework.dao.mapper.RoleMapper;
 import neatlogic.framework.dao.mapper.TeamMapper;
@@ -69,8 +69,6 @@ import neatlogic.framework.process.operationauth.core.ProcessAuthManager;
 import neatlogic.framework.process.stephandler.core.*;
 import neatlogic.framework.process.stepremind.core.ProcessTaskStepRemindTypeFactory;
 import neatlogic.framework.process.task.TaskConfigManager;
-import neatlogic.framework.process.workerpolicy.core.IWorkerPolicyHandler;
-import neatlogic.framework.process.workerpolicy.core.WorkerPolicyHandlerFactory;
 import neatlogic.framework.service.AuthenticationInfoService;
 import neatlogic.framework.util.$;
 import neatlogic.framework.util.FormUtil;
@@ -655,11 +653,11 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC
         if (CollectionUtils.isEmpty(processTaskStepWorkerPolicyList)) {
             return assignableWorkerStepMap;
         }
-        int isOnlyOnceExecute = 0;
-        IWorkerPolicyHandler workerPolicyHandler = WorkerPolicyHandlerFactory.getHandler(WorkerPolicy.PRESTEPASSIGN.getValue());
-        if (workerPolicyHandler == null) {
-            isOnlyOnceExecute = workerPolicyHandler.isOnlyOnceExecute();
-        }
+        int isOnlyOnceExecute = Integer.parseInt(ConfigManager.getConfig(ItsmTenantConfig.PROCESSTASK_WORKERPOLICY_ISONLYONCEEXECUTE));
+//        IWorkerPolicyHandler workerPolicyHandler = WorkerPolicyHandlerFactory.getHandler(WorkerPolicy.PRESTEPASSIGN.getValue());
+//        if (workerPolicyHandler == null) {
+//            isOnlyOnceExecute = workerPolicyHandler.isOnlyOnceExecute();
+//        }
         for (ProcessTaskStepWorkerPolicyVo workerPolicyVo : processTaskStepWorkerPolicyList) {
             if (!WorkerPolicy.PRESTEPASSIGN.getValue().equals(workerPolicyVo.getPolicy())) {
                 continue;
-- 
Gitee