From 64c09acc3f0f71b48ca29b8d4af610ed9f50a648 Mon Sep 17 00:00:00 2001 From: maliming Date: Sat, 6 Dec 2025 14:34:14 +0800 Subject: [PATCH] Refactor permission app service for clarity --- .../Abp/PermissionManagement/PermissionAppService.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs index 38feceb1a4..6091211c3c 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs @@ -189,10 +189,10 @@ public class PermissionAppService : ApplicationService, IPermissionAppService public virtual async Task SearchResourceProviderKeyAsync(string resourceName, string serviceName, string filter, int page) { var resourcePermissions = await ResourcePermissionManager.GetAvailablePermissionsAsync(resourceName); - if (!resourcePermissions.Any() || + if (resourcePermissions.IsNullOrEmpty() || !await AuthorizationService.IsGrantedAnyAsync(resourcePermissions.Select(p => p.ManagementPermissionName!).ToArray())) { - return new SearchProviderKeyListResultDto();; + return new SearchProviderKeyListResultDto(); } var lookupService = await ResourcePermissionManager.GetProviderKeyLookupServiceAsync(serviceName); @@ -219,7 +219,7 @@ public class PermissionAppService : ApplicationService, IPermissionAppService { if (await AuthorizationService.IsGrantedAsync(resourcePermission.ManagementPermissionName!)) { - result.Permissions.Add(new ResourcePermissionDefinitionDto() + result.Permissions.Add(new ResourcePermissionDefinitionDto { Name = resourcePermission.Name, DisplayName = resourcePermission.DisplayName?.Localize(StringLocalizerFactory), @@ -238,10 +238,10 @@ public class PermissionAppService : ApplicationService, IPermissionAppService }; var resourcePermissions = await ResourcePermissionManager.GetAvailablePermissionsAsync(resourceName); - var resourcePermissionGrantsGroup = await ResourcePermissionManager.GetAllGroupAsync(resourceName, resourceKey); - foreach (var resourcePermissionGrant in resourcePermissionGrantsGroup) + var resourcePermissionGrants = await ResourcePermissionManager.GetAllGroupAsync(resourceName, resourceKey); + foreach (var resourcePermissionGrant in resourcePermissionGrants) { - var resourcePermissionGrantInfoDto = new ResourcePermissionGrantInfoDto() + var resourcePermissionGrantInfoDto = new ResourcePermissionGrantInfoDto { ProviderName = resourcePermissionGrant.ProviderName, ProviderKey = resourcePermissionGrant.ProviderKey,