feat(REQ-4418) - 处理发起人主管的逻辑

This commit is contained in:
wangli 2025-08-25 19:44:33 +08:00
parent 88936feb50
commit 68c1ed0b8a

View File

@ -9,7 +9,6 @@ import cn.axzo.workflow.common.enums.ApproverSpecifyEnum;
import cn.axzo.workflow.common.enums.SignApproverOrgLimitEnum; import cn.axzo.workflow.common.enums.SignApproverOrgLimitEnum;
import cn.axzo.workflow.common.model.dto.CooperationOrgDTO; import cn.axzo.workflow.common.model.dto.CooperationOrgDTO;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
import cn.axzo.workflow.core.deletage.approverscope.ApproverScopeDTO;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.ListUtils; import org.apache.commons.collections4.ListUtils;
@ -18,6 +17,7 @@ import org.flowable.engine.delegate.DelegateExecution;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@ -51,17 +51,11 @@ public class BasedInitiatorLeaderV2TaskAssigneeSelector extends AbstractBpmnTask
@Override @Override
public List<BpmnTaskDelegateAssigner> select(FlowElement flowElement, DelegateExecution execution, public List<BpmnTaskDelegateAssigner> select(FlowElement flowElement, DelegateExecution execution,
Boolean throwException) { Boolean throwException) {
return super.select(flowElement, execution, throwException);
}
@Override
protected List<BpmnTaskDelegateAssigner> invokeService(FlowElement flowElement, DelegateExecution execution,
ApproverScopeDTO scopeDto) {
// 获取发起人 // 获取发起人
BpmnTaskDelegateAssigner initiator = BpmnTaskDelegateAssigner initiator =
BpmnTaskDelegateAssigner.toObjectCompatible(execution.getVariables().get(INTERNAL_INITIATOR)); BpmnTaskDelegateAssigner.toObjectCompatible(execution.getVariables().get(INTERNAL_INITIATOR));
if (Objects.isNull(initiator)) { if (Objects.isNull(initiator)) {
return super.invokeService(flowElement, execution, scopeDto); return Collections.emptyList();
} }
CooperationOrgDTO orgDTO = (CooperationOrgDTO) execution.getVariables().get(BIZ_ORG_RELATION); CooperationOrgDTO orgDTO = (CooperationOrgDTO) execution.getVariables().get(BIZ_ORG_RELATION);
@ -83,5 +77,4 @@ public class BasedInitiatorLeaderV2TaskAssigneeSelector extends AbstractBpmnTask
return convertApprover(apiResultUsers); return convertApprover(apiResultUsers);
} }
} }