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

Merge branch 'feature/REQ-5965' into dev

Browse Source
This commit is contained in:
wangli 2025-12-03 10:42:37 +08:00
commit 43fc084016
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskCmd.java
View File

@ -162,18 +162,20 @@ public class CustomApproveTaskCmd extends AbstractCommand<Void> implements Seria
}
task.setTransientVariable(TASK_COMPLETE_OPERATION_TYPE + taskId, APPROVED.getStatus());
Map<String, Object> pendingVariables = runtimeService.getVariable(task.getProcessInstanceId(), PENDING_TEMPLATE_VARIABLE, Map.class);
if (!CollectionUtils.isEmpty(pendingVariables) && !CollectionUtils.isEmpty(variables)) {
variables.forEach((k, v) -> {
if (pendingVariables.containsKey(k)) {
pendingVariables.put(k, v);
}
});
if (!CollectionUtils.isEmpty(variables)) {
Map<String, Object> pendingVariables = runtimeService.getVariable(task.getProcessInstanceId(), PENDING_TEMPLATE_VARIABLE, Map.class);
if (!CollectionUtils.isEmpty(pendingVariables)) {
variables.forEach((k, v) -> {
if (pendingVariables.containsKey(k)) {
pendingVariables.put(k, v);
}
});
}
// 如果有待办模板变量，则更新待办模板变量
variables.put(PENDING_TEMPLATE_VARIABLE, pendingVariables);
// 更新流程内的变量
runtimeService.setVariables(task.getProcessInstanceId(), variables);
}
// 如果有待办模板变量，则更新待办模板变量
variables.put(PENDING_TEMPLATE_VARIABLE, pendingVariables);
// 更新流程内的变量
runtimeService.setVariables(task.getProcessInstanceId(), variables);
// 记录电子签名的图片
recordSignature(task, runtimeService, attachmentList, advice, approver);