Merge pull request #22517 from abpframework/auto-merge/rel-9-2/3581

Merge branch dev with rel-9.2

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs

@@ -129,12 +129,12 @@ public partial class UserManagement
 
             if (await PermissionChecker.IsGrantedAsync(IdentityPermissions.Users.ManageRoles))
             {
-                var userRoleNames = (await AppService.GetRolesAsync(entity.Id)).Items.Select(r => r.Name).ToList();
+                var userRoleIds = (await AppService.GetRolesAsync(entity.Id)).Items.Select(r => r.Id).ToList();
 
                 EditUserRoles = Roles.Select(x => new AssignedRoleViewModel
                 {
                     Name = x.Name,
-                    IsAssigned = userRoleNames.Contains(x.Name)
+                    IsAssigned = userRoleIds.Contains(x.Id)
                 }).ToArray();
 
                 ChangePasswordTextRole(TextRole.Password);

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs

@@ -45,10 +45,10 @@ public class EditModalModel : IdentityPageModel
         }
         IsEditCurrentUser = CurrentUser.Id == id;
 
-        var userRoleNames = (await IdentityUserAppService.GetRolesAsync(UserInfo.Id)).Items.Select(r => r.Name).ToList();
+        var userRoleIds = (await IdentityUserAppService.GetRolesAsync(UserInfo.Id)).Items.Select(r => r.Id).ToList();
         foreach (var role in Roles)
         {
-            if (userRoleNames.Contains(role.Name))
+            if (userRoleIds.Contains(role.Id))
             {
                 role.IsAssigned = true;
             }
@@ -122,6 +122,8 @@ public class EditModalModel : IdentityPageModel
 
     public class AssignedRoleViewModel
     {
+        public Guid Id { get; set; }
+
         [Required]
         [HiddenInput]
         public string Name { get; set; }