From a4888bf9f62863f6e2fc363acd69bc501d087e2a Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 25 Mar 2026 15:39:55 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-7125)=20-=20=E5=BA=94=E7=BD=97?= =?UTF-8?q?=E6=80=BB=E8=A6=81=E6=B1=82=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=E3=80=81=E8=A7=92=E8=89=B2=E3=80=81=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=9D=9E=E2=80=9C=E9=A1=B9=E7=9B=AE=E5=86=85?= =?UTF-8?q?=E5=8F=82=E5=BB=BA=E5=8D=95=E4=BD=8D=E7=9A=84=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=B2=97=E4=BD=8D=E2=80=9D=E7=9A=84=E5=8D=95=E4=BD=8D=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../delegate/BasedIdentityV2TaskAssigneeSelector.java | 6 +++--- .../delegate/BasedPositionV2TaskAssigneeSelector.java | 8 ++++---- .../delegate/BasedRoleV2TaskAssigneeSelector.java | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedIdentityV2TaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedIdentityV2TaskAssigneeSelector.java index 5ded3cf33..f225a4c4b 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedIdentityV2TaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedIdentityV2TaskAssigneeSelector.java @@ -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: diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedPositionV2TaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedPositionV2TaskAssigneeSelector.java index b09606115..f4d890931 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedPositionV2TaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedPositionV2TaskAssigneeSelector.java @@ -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: diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleV2TaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleV2TaskAssigneeSelector.java index ca1888fe1..b92ab1886 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleV2TaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleV2TaskAssigneeSelector.java @@ -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: