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

feat(REQ-4418) - 调整新版配置中的最后操作人获取的问题

Browse Source
This commit is contained in:
wangli 2025-08-29 11:53:33 +08:00
parent 2d88d57ca9
commit 29879baf7b
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedIdentityV2TaskAssigneeSelector.java
View File

@ -104,7 +104,8 @@ public class BasedIdentityV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
break;
case pre_node_approver:
log.info("executing role v2 with pre_node_approver");
BpmnTaskDelegateAssigner lastOperationApprover = execution.getVariable(CLOSE_PROCESS_ASSIGNER, BpmnTaskDelegateAssigner.class);
BpmnTaskDelegateAssigner lastOperationApprover =
BpmnTaskDelegateAssigner.toObjectCompatible(execution.getVariables().get(CLOSE_PROCESS_ASSIGNER));
if (Objects.isNull(lastOperationApprover)) {
return Collections.emptyList();
}

3
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedPositionV2TaskAssigneeSelector.java
View File

@ -125,7 +125,8 @@ public class BasedPositionV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
case pre_node_approver:
log.info("executing position v2 with pre_node_approver");
Optional<ApproverSpecifyRangeUnitEnum> approverSpecifyRangeUnit4PreNodeApprover = getApproverSpecifyRangeUnit(flowElement);
BpmnTaskDelegateAssigner lastOperationApprover = execution.getVariable(CLOSE_PROCESS_ASSIGNER, BpmnTaskDelegateAssigner.class);
BpmnTaskDelegateAssigner lastOperationApprover =
BpmnTaskDelegateAssigner.toObjectCompatible(execution.getVariables().get(CLOSE_PROCESS_ASSIGNER));
if (Objects.isNull(lastOperationApprover)) {
return Collections.emptyList();
}

7
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleV2TaskAssigneeSelector.java
View File

@ -18,6 +18,7 @@ import com.google.common.collect.Sets;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.ListUtils;
import org.flowable.bpmn.model.FlowElement;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.delegate.DelegateExecution;
import org.springframework.stereotype.Component;
@ -55,6 +56,8 @@ import static cn.axzo.workflow.core.common.utils.BpmnMetaParserHelper.getSpecial
public class BasedRoleV2TaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
@Resource
private OrgNodeUserApi orgNodeUserApi;
@Resource
private RuntimeService runtimeService;
@Override
public String getType() {
@ -124,7 +127,9 @@ public class BasedRoleV2TaskAssigneeSelector extends AbstractBpmnTaskAssigneeSel
case pre_node_approver:
log.info("executing role v2 with pre_node_approver");
Optional<ApproverSpecifyRangeUnitEnum> approverSpecifyRangeUnit4PreNodeApprover = getApproverSpecifyRangeUnit(flowElement);
BpmnTaskDelegateAssigner lastOperationApprover = execution.getVariable(CLOSE_PROCESS_ASSIGNER, BpmnTaskDelegateAssigner.class);
BpmnTaskDelegateAssigner lastOperationApprover =
BpmnTaskDelegateAssigner.toObjectCompatible(execution.getVariables().get(CLOSE_PROCESS_ASSIGNER));
if (Objects.isNull(lastOperationApprover)) {
return Collections.emptyList();
}