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

feat(REQ-7125) - 应罗总要求，移除岗位、角色、身份中的非“项目内参建单位的企业岗位”的单位类型传参

Browse Source
This commit is contained in:
wangli 2026-03-25 15:39:55 +08:00
parent c5c2d4f6cd
commit a4888bf9f6
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,7 +92,7 @@ public class BasedIdentityV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
.nodeId(orgDTO.getNodeId())
.upLevel(SignApproverOrgLimitEnum.LV_ALL.getCode())
.crossDomain(false)
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
// .cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case within_the_project_construction_units:
@ -110,7 +110,7 @@ public class BasedIdentityV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
v2ReqBuilder.scope(FlowTaskAssignerScopeDTO.builder()
.nodeId(initiator.parseNodeId())
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
// .cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case pre_node_approver:
@ -123,7 +123,7 @@ public class BasedIdentityV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
v2ReqBuilder.scope(FlowTaskAssignerScopeDTO.builder()
.nodeId(lastOperationApprover.parseNodeId())
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
// .cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
default:

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

@ -95,7 +95,7 @@ public class BasedPositionV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
.nodeId(orgDTO.getNodeId())
.upLevel(SignApproverOrgLimitEnum.LV_ALL.getCode())
.crossDomain(false)
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
// .cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case within_the_project_construction_units:
@ -118,7 +118,7 @@ public class BasedPositionV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.crossDomain(approverSpecifyRangeUnit.filter(unit -> unit != in_project).isPresent())
.entUpLevel(approverSpecifyRangeUnit.orElse(ApproverSpecifyRangeUnitEnum.UNKNOWN).getValue())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
// .cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case initiator:
@ -129,7 +129,7 @@ public class BasedPositionV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.crossDomain(approverSpecifyRangeUnit4Initiator.filter(unit -> unit != in_project).isPresent())
.entUpLevel(approverSpecifyRangeUnit4Initiator.orElse(ApproverSpecifyRangeUnitEnum.UNKNOWN).getValue())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
// .cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case pre_node_approver:
@ -145,7 +145,7 @@ public class BasedPositionV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.crossDomain(approverSpecifyRangeUnit4PreNodeApprover.filter(unit -> unit != in_project).isPresent())
.entUpLevel(approverSpecifyRangeUnit4PreNodeApprover.orElse(ApproverSpecifyRangeUnitEnum.UNKNOWN).getValue())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
// .cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
default:

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

@ -97,7 +97,7 @@ public class BasedRoleV2TaskAssigneeSelector extends AbstractBpmnTaskAssigneeSel
.nodeId(orgDTO.getNodeId())
.upLevel(SignApproverOrgLimitEnum.LV_ALL.getCode())
.crossDomain(false)
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
// .cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case within_the_project_construction_units:
@ -120,7 +120,7 @@ public class BasedRoleV2TaskAssigneeSelector extends AbstractBpmnTaskAssigneeSel
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.crossDomain(approverSpecifyRangeUnit.filter(unit -> unit != in_project).isPresent())
.entUpLevel(approverSpecifyRangeUnit.orElse(ApproverSpecifyRangeUnitEnum.UNKNOWN).getValue())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
// .cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case initiator:
@ -131,7 +131,7 @@ public class BasedRoleV2TaskAssigneeSelector extends AbstractBpmnTaskAssigneeSel
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.crossDomain(approverSpecifyRangeUnit4Initiator.filter(unit -> unit != in_project).isPresent())
.entUpLevel(approverSpecifyRangeUnit4Initiator.orElse(ApproverSpecifyRangeUnitEnum.UNKNOWN).getValue())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
// .cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case pre_node_approver:
@ -148,7 +148,7 @@ public class BasedRoleV2TaskAssigneeSelector extends AbstractBpmnTaskAssigneeSel
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.crossDomain(approverSpecifyRangeUnit4PreNodeApprover.filter(unit -> unit != in_project).isPresent())
.entUpLevel(approverSpecifyRangeUnit4PreNodeApprover.orElse(ApproverSpecifyRangeUnitEnum.UNKNOWN).getValue())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
// .cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
default: