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

feat(REQ-2616) - 完善Activity 节点的回调时,参数缺失的问题

Browse Source
This commit is contained in:
wangli 2024-09-03 19:00:27 +08:00
parent 89c82ab9b3
commit e569697c8f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/AsyncActivityCallbackJobHandler.java
View File

@ -17,7 +17,9 @@ import org.flowable.job.service.JobHandler;
import org.flowable.job.service.impl.persistence.entity.JobEntity; import org.flowable.job.service.impl.persistence.entity.JobEntity;
import org.flowable.task.api.Task; import org.flowable.task.api.Task;
import org.flowable.variable.api.delegate.VariableScope; import org.flowable.variable.api.delegate.VariableScope;
import org.springframework.util.CollectionUtils;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
@ -56,8 +58,10 @@ public class AsyncActivityCallbackJobHandler extends AbstractJobHandler implemen
RuntimeService runtimeService = processEngineConfiguration.getRuntimeService(); RuntimeService runtimeService = processEngineConfiguration.getRuntimeService();
runtimeService.setVariables(processInstance.getId(), dto.getVariables()); runtimeService.setVariables(processInstance.getId(), dto.getVariables());
Map<String, Object> processVariables = processInstance.getProcessVariables(); Map<String, Object> processVariables = new HashMap<>(processInstance.getProcessVariables());
processVariables.putAll(dto.getVariables()); if (!CollectionUtils.isEmpty(dto.getVariables())) {
processVariables.putAll(dto.getVariables());
}
eventDispatcher.dispatchEvent(new BizCallbackEventImpl(BizCallbackEventImpl.BizCallbackEventType.CALLBACK, eventDispatcher.dispatchEvent(new BizCallbackEventImpl(BizCallbackEventImpl.BizCallbackEventType.CALLBACK,
task.getTaskDefinitionKey(), task.getName(), task.getTaskDefinitionKey(), task.getName(),
task.getProcessInstanceId(), task.getProcessDefinitionId(), task.getProcessInstanceId(), task.getProcessDefinitionId(),