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-25 10:29:17 +08:00
commit 0f24168d32
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,7 +235,7 @@ public class CustomGetProcessInstanceVariablesToObjectCmd extends AbstractComman
variables.add(VariableObjectDTO.builder() variables.add(VariableObjectDTO.builder()
.key(field.getId()) .key(field.getId())
.desc(field.getName()) .desc(field.getName())
.value(StringUtils.collectionToCommaDelimitedString(optionNames)) .value(StringUtils.collectionToDelimitedString(optionNames, "；"))
.type(convert(field.getType())) .type(convert(field.getType()))
.build()); .build());
} }
@ -250,7 +250,7 @@ public class CustomGetProcessInstanceVariablesToObjectCmd extends AbstractComman
variables.add(VariableObjectDTO.builder() variables.add(VariableObjectDTO.builder()
.key(field.getId()) .key(field.getId())
.desc(field.getName()) .desc(field.getName())
.value(StringUtils.collectionToCommaDelimitedString(optionNames)) .value(StringUtils.collectionToDelimitedString(optionNames, "；"))
.type(convert(field.getType())) .type(convert(field.getType()))
.build()); .build());
} }

2
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java
View File

@ -447,7 +447,7 @@ public class PrintAdminController implements PrintAdminApi {
return optionFormField.getOptions().stream() return optionFormField.getOptions().stream()
.filter(i -> selectedValues.contains(i.getId())) .filter(i -> selectedValues.contains(i.getId()))
.map(Option::getName) .map(Option::getName)
.collect(Collectors.joining(",")); .collect(Collectors.joining("；"));
} }
private void generateSystemFieldVariables(String processInstanceId, Map<String, Object> result) { private void generateSystemFieldVariables(String processInstanceId, Map<String, Object> result) {