diff --git a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java index 63d5700fe73cb51abd538d6d6eb362e81b2e5f01..cdfc819fe642755225e535e83f8524ce30222574 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 aedb339811799713519d1e224ce97e02bdef98ed..96811dfabfa98baa43c33b729f330ce8df50c15c 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;