From 61c9a04f9feb35463bba88fa1ee54499bffc84c4 Mon Sep 17 00:00:00 2001 From: jason <2667446@qq.com> Date: Sun, 17 Nov 2024 23:58:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=91=20=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95=E5=86=85?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AD=97=E6=AE=B5=E5=8F=AF=E4=BB=A5=E5=A4=9A?= =?UTF-8?q?=E9=80=89=E6=97=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BpmTaskCandidateUserFieldOnFormStrategy.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateUserFieldOnFormStrategy.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateUserFieldOnFormStrategy.java index 6d28955b7..2226b2a2c 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateUserFieldOnFormStrategy.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateUserFieldOnFormStrategy.java @@ -2,26 +2,22 @@ package cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.u import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Assert; -import cn.hutool.core.map.MapUtil; import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy; import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum; import org.flowable.bpmn.model.BpmnModel; import org.flowable.engine.delegate.DelegateExecution; import org.springframework.stereotype.Component; -import java.util.HashSet; import java.util.Map; import java.util.Set; -import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet; - /** * 表单内用户字段 {@link BpmTaskCandidateUserStrategy} 实现类 * * @author jason */ @Component -public class BpmTaskCandidateUserFieldOnFormStrategy implements BpmTaskCandidateStrategy { +public class BpmTaskCandidateUserFieldOnFormStrategy implements BpmTaskCandidateStrategy { @Override public BpmTaskCandidateStrategyEnum getStrategy() { @@ -35,7 +31,7 @@ public class BpmTaskCandidateUserFieldOnFormStrategy implements BpmTaskCandidate @Override public Set calculateUsersByTask(DelegateExecution execution, String param) { - Object result = execution.getVariable(param); + Object result = execution.getVariable(param); return Convert.toSet(Long.class, result); } @@ -43,8 +39,8 @@ public class BpmTaskCandidateUserFieldOnFormStrategy implements BpmTaskCandidate public Set calculateUsersByActivity(BpmnModel bpmnModel, String activityId, String param, Long startUserId, String processDefinitionId, Map processVariables) { - Long result = MapUtil.getLong(processVariables, param); - return result != null ? asSet(result) : new HashSet<>(); + Object result = processVariables == null ? null : processVariables.get(param); + return Convert.toSet(Long.class, result); } }