From e85cf6cde507af2b23f58d43f54629094b91df2f Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Thu, 19 Sep 2024 17:52:36 +0800 Subject: [PATCH] =?UTF-8?q?REQ-2924-=E4=BF=AE=E5=A4=8DNPE=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/delegate/BasedRoleTaskAssigneeSelector.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleTaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleTaskAssigneeSelector.java index f05d1b81b..cba156eba 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleTaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleTaskAssigneeSelector.java @@ -16,7 +16,9 @@ import org.flowable.bpmn.model.FlowElement; import org.flowable.engine.delegate.DelegateExecution; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; @@ -69,7 +71,7 @@ public class BasedRoleTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelec ListFlowTaskAssignerReq req = ListFlowTaskAssignerReq.builder() .procInstId(execution.getProcessInstanceId()) .procInstType(Integer.valueOf(Objects.requireNonNull(categoryItemVO.map(CategoryItemVO::getWorkspaceTypeCode).orElse(null)))) - .orgScopes(scopeDto.getOrgScopes().stream() + .orgScopes(CollectionUtils.isEmpty(scopeDto.getOrgScopes()) ? Collections.emptyList() : scopeDto.getOrgScopes().stream() .map(os -> ListFlowTaskAssignerReq.OrgScope.builder() .ouId(os.getOuId()) .nodeId(os.getNodeId()) @@ -77,7 +79,7 @@ public class BasedRoleTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelec .workspaceType(os.getWorkspaceType()) .build()) .collect(Collectors.toList())) - .workerTeamScopes(scopeDto.getWorkerTeamScopes().stream() + .workerTeamScopes(CollectionUtils.isEmpty(scopeDto.getWorkerTeamScopes()) ? Collections.emptyList() : scopeDto.getWorkerTeamScopes().stream() .map(ot -> ListFlowTaskAssignerReq.OrgScope.builder() .workspaceId(ot.getWorkspaceId()) .ouId(ot.getOuId())