From 340416bdeaa86b213601965f1e424d2141be4ced Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 4 Mar 2026 11:11:11 +0800 Subject: [PATCH] refactor: Clean up filter handling in UserManagement and optimize permission checks in PermissionManagementModal --- .../Pages/Identity/UserManagement.razor.cs | 1 - .../Components/PermissionManagementModal.razor.cs | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.MudBlazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor.MudBlazor/Pages/Identity/UserManagement.razor.cs index 832d45d85b..7e174ff243 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor.MudBlazor/Pages/Identity/UserManagement.razor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Blazor.MudBlazor/Pages/Identity/UserManagement.razor.cs @@ -91,7 +91,6 @@ public partial class UserManagement { if (e.Key == "Enter") { - GetListInput.Filter = GetListInput.Filter; CurrentPage = 1; await _dataGrid.ReloadServerDataAsync(); } diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor.cs index 8999b60a19..b408d49a71 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor.cs @@ -316,6 +316,7 @@ public partial class PermissionManagementModal } return permissionGrantInfo.IsGranted && + permissionGrantInfo.GrantedProviders.Any() && permissionGrantInfo.GrantedProviders.All(p => p.ProviderName != _providerName); } @@ -378,8 +379,8 @@ public partial class PermissionManagementModal ? _allGroups.ToList() : _allGroups.Where(x => x.DisplayName.Contains(_permissionGroupSearchText!, StringComparison.OrdinalIgnoreCase) || x.Permissions.Any(permission => permission.DisplayName.Contains(_permissionGroupSearchText!, StringComparison.OrdinalIgnoreCase))).ToList(); - GrantAll = _groups.SelectMany(x => x.Permissions).All(p => p.IsGranted); - GrantAny = !GrantAll && _groups.SelectMany(x => x.Permissions).Any(p => p.IsGranted); + GrantAll = _allGroups.SelectMany(x => x.Permissions).All(p => p.IsGranted); + GrantAny = !GrantAll && _allGroups.SelectMany(x => x.Permissions).Any(p => p.IsGranted); NormalizePermissionGroup(false); }