Merge branch 'feature/REQ-5965' into 'test'
feat(REQ-5965) - 调整审批业务变量未覆盖的问题 See merge request universal/infrastructure/backend/workflow-engine!27
This commit is contained in:
commit
12f4be62bc
@ -290,6 +290,11 @@ public class CustomGetProcessInstanceVariablesToObjectCmd extends AbstractComman
|
||||
|
||||
private void addProcessDefinitionKeyAndVariables(List<VariableObjectDTO> variables, Map<String, Object> bizVariables, HistoricProcessInstance historicProcessInstance) {
|
||||
CategoryService categoryService = SpringContextUtils.getBean(CategoryService.class);
|
||||
Map<String, Object> processVariables = historicProcessInstance.getProcessVariables();
|
||||
bizVariables.forEach((k, v) -> {
|
||||
Object newObj = processVariables.get(k);
|
||||
bizVariables.put(k, Objects.nonNull(newObj) ? newObj : v);
|
||||
});
|
||||
categoryService.get(BPM_MODEL_CATEGORY, historicProcessInstance.getProcessDefinitionKey()).ifPresent(category -> {
|
||||
variables.add(VariableObjectDTO.builder()
|
||||
.key(PRINT_VAR_PROCESS_DEFINITION_KEY)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user