From 3af8822bbae4a2cf1f5b339219bd4f1f2320c8ad Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Tue, 24 Sep 2024 17:02:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-2924)=20-=20=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA=EF=BC=8C=E4=BC=9A=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E4=BA=8C=E6=96=B9=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=98=AF=E5=90=A6=E5=9C=A8=E8=81=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TransferToAdminTaskAssigneeSelector.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/TransferToAdminTaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/TransferToAdminTaskAssigneeSelector.java index 76c29318e..d39497a57 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/TransferToAdminTaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/TransferToAdminTaskAssigneeSelector.java @@ -57,8 +57,10 @@ public class TransferToAdminTaskAssigneeSelector extends AbstractBpmnTaskAssigne protected List invokeService(FlowElement flowElement, DelegateExecution execution, ApproverScopeDTO scopeDto) { + Optional approverScope = BpmnMetaParserHelper.getApproverScope((UserTask) flowElement); Optional optSpecify = BpmnMetaParserHelper.getApproverSpecify((UserTask) flowElement); - if (optSpecify.isPresent() + if (optSpecify.isPresent() && approverScope.isPresent() + && Objects.equals(ApproverScopeEnum.projectWorkspace, approverScope.get()) && !Objects.equals(ApproverSpecifyEnum.position, optSpecify.get()) && !Objects.equals(ApproverSpecifyEnum.role, optSpecify.get())) { return Collections.emptyList(); @@ -78,12 +80,11 @@ public class TransferToAdminTaskAssigneeSelector extends AbstractBpmnTaskAssigne ListFlowTaskAssignerReq req = builder.workspaceAdmin(false).build(); req.setProcInstId(execution.getProcessInstanceId()); req.setCooperateTypes(getCooperationTypes(flowElement)); - BpmnMetaParserHelper.getApproverScope((UserTask) flowElement) - .ifPresent(i -> { - if (Objects.equals(i, ApproverScopeEnum.projectWorkspace)) { - req.setWorkspaceAdmin(true); - } - }); + approverScope.ifPresent(i -> { + if (Objects.equals(i, ApproverScopeEnum.projectWorkspace)) { + req.setWorkspaceAdmin(true); + } + }); List flowTaskAssigners = parseApiResult(() -> flowSupportApi.listTaskAssignerAdminV2(req), "审批节点: " + flowElement.getId() + ", 通过管理员查询审批人",