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 saasRoleUsers = listUserPermission(treePermissionReq); + if (CollectionUtils.isEmpty(saasRoleUsers)) { + return Collections.emptySet(); + } Map> roleFeatureResourceMap = listRoleFeatureResource(saasRoleUsers, treePermissionReq); List workspaceProductFeatureSources = listWorkspaceProducts(treePermissionReq); + if (CollectionUtils.isEmpty(workspaceProductFeatureSources)) { + return Collections.emptySet(); + } //免授权 Set authFreeFeatureIds = allFeatureResources.stream() .filter(e -> BooleanUtils.isTrue(e.isNotAuth()))