From 4eb23c307c13094b107aa3ce5f2f724bf323dedf Mon Sep 17 00:00:00 2001
From: lilong <lilong@axzo.cn>
Date: Mon, 26 Aug 2024 13:50:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:(REQ-2699)=20=E8=8F=9C=E5=8D=95=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=8E=92=E9=99=A4?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B2=A1=E6=9C=89=E8=A7=92=E8=89=B2=E3=80=81?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B2=A1=E6=9C=89=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tyr/server/service/impl/PermissionQueryServiceImpl.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionQueryServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionQueryServiceImpl.java
index ad316568..637e1011 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionQueryServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionQueryServiceImpl.java
@@ -877,11 +877,17 @@ public class PermissionQueryServiceImpl implements PermissionQueryService {
         }
 
         List<SaasRoleUserV2DTO> saasRoleUsers = listUserPermission(treePermissionReq);
+        if (CollectionUtils.isEmpty(saasRoleUsers)) {
+            return Collections.emptySet();
+        }
 
         Map<Long, List<RoleSaasFeatureResourceCacheService.SaasFeatureResourceDTO>> roleFeatureResourceMap = listRoleFeatureResource(saasRoleUsers, treePermissionReq);
 
         List<WorkspaceProductService.WorkspaceProductFeatureSource> workspaceProductFeatureSources = listWorkspaceProducts(treePermissionReq);
 
+        if (CollectionUtils.isEmpty(workspaceProductFeatureSources)) {
+            return Collections.emptySet();
+        }
         //免授权
         Set<Long> authFreeFeatureIds = allFeatureResources.stream()
                 .filter(e -> BooleanUtils.isTrue(e.isNotAuth()))