From b8c04057951edd809fc24ddae6873a0003479aea Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 24 Nov 2025 11:51:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(RDMP-3845)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=8D=95=E9=80=89=E5=A4=8D=E9=80=89=E6=A1=86=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20options=20=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cmd/CustomGetProcessInstanceVariablesToObjectCmd.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java index cc6bb5ef8..bfadf9559 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java @@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.ListUtils; import org.flowable.common.engine.api.FlowableObjectNotFoundException; import org.flowable.common.engine.impl.interceptor.CommandContext; import org.flowable.engine.HistoryService; @@ -230,7 +231,7 @@ public class CustomGetProcessInstanceVariablesToObjectCmd extends AbstractComman && fieldValue.toString().startsWith("[") && fieldValue.toString().endsWith("]")) { List selectedOptions = JSON.parseArray((String) fieldValue, String.class); - List optionNames = optionField.getOptions().stream().filter(i -> selectedOptions.contains(i.getId())).map(Option::getName).collect(Collectors.toList()); + List optionNames = ListUtils.emptyIfNull(optionField.getOptions()).stream().filter(i -> selectedOptions.contains(i.getId())).map(Option::getName).collect(Collectors.toList()); variables.add(VariableObjectDTO.builder() .key(field.getId()) .desc(field.getName()) @@ -245,7 +246,7 @@ public class CustomGetProcessInstanceVariablesToObjectCmd extends AbstractComman if (field instanceof OptionFormField) { OptionFormField optionField = (OptionFormField) field; if (StringUtils.hasText(fieldValue.toString())) { - List optionNames = optionField.getOptions().stream().filter(i -> Objects.equals(fieldValue, i.getId())).map(Option::getName).collect(Collectors.toList()); + List optionNames = ListUtils.emptyIfNull(optionField.getOptions()).stream().filter(i -> Objects.equals(fieldValue, i.getId())).map(Option::getName).collect(Collectors.toList()); variables.add(VariableObjectDTO.builder() .key(field.getId()) .desc(field.getName())