From 9e6402fc55f76f5d5e6396d88e5b093834ac5563 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 14 Feb 2025 16:41:36 +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 --- .../framework/process/constvalue/ItsmTenantConfig.java | 2 ++ .../process/stephandler/core/ProcessStepHandlerBase.java | 4 +++- .../process/workerpolicy/core/IWorkerPolicyHandler.java | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/framework/process/constvalue/ItsmTenantConfig.java b/src/main/java/neatlogic/framework/process/constvalue/ItsmTenantConfig.java index 8c47d1a2..44373186 100644 --- a/src/main/java/neatlogic/framework/process/constvalue/ItsmTenantConfig.java +++ b/src/main/java/neatlogic/framework/process/constvalue/ItsmTenantConfig.java @@ -29,6 +29,8 @@ public enum ItsmTenantConfig implements ITenantConfig { WORKCENTER_CUSTOM_LIMIT("workcenter.custom.limit", "5", "nfpc.itsmtenantconfig.workcentercustomlimit"), WORKCENTER_PROCESSTASK_NEWPAGE("workcenter.processtask.newpage", "0", "nfpc.itsmtenantconfig.workcenterprocesstasknewpage"), PROCESSTASK_TAB_LAYOUT("processtask.tab.layout", "{}", "nfpc.itsmtenantconfig.processtasktablayout"), + + PROCESSTASK_WORKERPOLICY_ISONLYONCEEXECUTE("processtask.workerpolicy.isonlyonceexecute", "0", "nfpc.itsmtenantconfig.processtaskworkerpolicyisonlyonceexecute"), ; String key; diff --git a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java index f39364fd..89bb51af 100644 --- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java +++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java @@ -22,6 +22,7 @@ import com.alibaba.fastjson.JSONPath; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.common.constvalue.GroupSearch; import neatlogic.framework.common.constvalue.systemuser.SystemUser; +import neatlogic.framework.config.ConfigManager; import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.dao.mapper.RoleMapper; import neatlogic.framework.dao.mapper.TeamMapper; @@ -529,7 +530,8 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { continue; } /* 如果workerList.size()>0，说明已经存在过处理人，分配策略设置只分配一次，则继续使用旧处理人，否则启用分派 **/ - if (Objects.equals(workerPolicyHandler.isOnlyOnceExecute(), 1) && CollectionUtils.isNotEmpty(workerSet)) { + int isOnlyOnceExecute = Integer.parseInt(ConfigManager.getConfig(ItsmTenantConfig.PROCESSTASK_WORKERPOLICY_ISONLYONCEEXECUTE)); + if (Objects.equals(isOnlyOnceExecute, 1) && CollectionUtils.isNotEmpty(workerSet)) { continue; } workerSet.clear(); diff --git a/src/main/java/neatlogic/framework/process/workerpolicy/core/IWorkerPolicyHandler.java b/src/main/java/neatlogic/framework/process/workerpolicy/core/IWorkerPolicyHandler.java index 07b37a8f..16768b5b 100644 --- a/src/main/java/neatlogic/framework/process/workerpolicy/core/IWorkerPolicyHandler.java +++ b/src/main/java/neatlogic/framework/process/workerpolicy/core/IWorkerPolicyHandler.java @@ -18,6 +18,7 @@ public interface IWorkerPolicyHandler { * * @return */ + @Deprecated int isOnlyOnceExecute(); /** -- Gitee