wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/RDMP-3845' into dev

Browse Source
This commit is contained in:
wangli 2025-11-24 11:53:34 +08:00
commit 65b8d9f9c4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
View File

@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.ListUtils;
import org.flowable.common.engine.api.FlowableObjectNotFoundException; import org.flowable.common.engine.api.FlowableObjectNotFoundException;
import org.flowable.common.engine.impl.interceptor.CommandContext; import org.flowable.common.engine.impl.interceptor.CommandContext;
import org.flowable.engine.HistoryService; import org.flowable.engine.HistoryService;
@ -230,7 +231,7 @@ public class CustomGetProcessInstanceVariablesToObjectCmd extends AbstractComman
&& fieldValue.toString().startsWith("[") && fieldValue.toString().startsWith("[")
&& fieldValue.toString().endsWith("]")) { && fieldValue.toString().endsWith("]")) {
List<String> selectedOptions = JSON.parseArray((String) fieldValue, String.class); List<String> selectedOptions = JSON.parseArray((String) fieldValue, String.class);
List<String> optionNames = optionField.getOptions().stream().filter(i -> selectedOptions.contains(i.getId())).map(Option::getName).collect(Collectors.toList()); List<String> optionNames = ListUtils.emptyIfNull(optionField.getOptions()).stream().filter(i -> selectedOptions.contains(i.getId())).map(Option::getName).collect(Collectors.toList());
variables.add(VariableObjectDTO.builder() variables.add(VariableObjectDTO.builder()
.key(field.getId()) .key(field.getId())
.desc(field.getName()) .desc(field.getName())
@ -245,7 +246,7 @@ public class CustomGetProcessInstanceVariablesToObjectCmd extends AbstractComman
if (field instanceof OptionFormField) { if (field instanceof OptionFormField) {
OptionFormField optionField = (OptionFormField) field; OptionFormField optionField = (OptionFormField) field;
if (StringUtils.hasText(fieldValue.toString())) { if (StringUtils.hasText(fieldValue.toString())) {
List<String> optionNames = optionField.getOptions().stream().filter(i -> Objects.equals(fieldValue, i.getId())).map(Option::getName).collect(Collectors.toList()); List<String> optionNames = ListUtils.emptyIfNull(optionField.getOptions()).stream().filter(i -> Objects.equals(fieldValue, i.getId())).map(Option::getName).collect(Collectors.toList());
variables.add(VariableObjectDTO.builder() variables.add(VariableObjectDTO.builder()
.key(field.getId()) .key(field.getId())
.desc(field.getName()) .desc(field.getName())