diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs index 8d32f8cb94..d5f51ae71b 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs @@ -14,7 +14,7 @@ public interface IIdentityRoleRepository : IBasicRepository CancellationToken cancellationToken = default ); - Task> GetListWithUserCountAsync( + Task> GetListWithUserCountAsync( string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/RoleWithUserCount.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleWithUserCount.cs similarity index 64% rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/RoleWithUserCount.cs rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleWithUserCount.cs index 54b3f5e45e..d706d4aa8e 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/RoleWithUserCount.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleWithUserCount.cs @@ -2,13 +2,13 @@ using System; namespace Volo.Abp.Identity; -public class RoleWithUserCount +public class IdentityRoleWithUserCount { public IdentityRole Role { get; set; } public long UserCount { get; set; } - public RoleWithUserCount(IdentityRole role, long userCount) + public IdentityRoleWithUserCount(IdentityRole role, long userCount) { Role = role; UserCount = userCount; diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityRoleRepository.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityRoleRepository.cs index c902330b4e..e51a7e923e 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityRoleRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityRoleRepository.cs @@ -28,7 +28,7 @@ public class EfCoreIdentityRoleRepository : EfCoreRepository r.NormalizedName == normalizedRoleName, GetCancellationToken(cancellationToken)); } - public async Task> GetListWithUserCountAsync( + public async Task> GetListWithUserCountAsync( string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, @@ -49,7 +49,7 @@ public class EfCoreIdentityRoleRepository : EfCoreRepository new RoleWithUserCount(role, userCount.FirstOrDefault(x => x.RoleId == role.Id)?.Count ?? 0)).ToList(); + return roles.Select(role => new IdentityRoleWithUserCount(role, userCount.FirstOrDefault(x => x.RoleId == role.Id)?.Count ?? 0)).ToList(); } public virtual async Task> GetListAsync( diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs index 3d0c1b65c0..4fef85e85c 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs @@ -28,7 +28,7 @@ public class MongoIdentityRoleRepository : MongoDbRepository r.NormalizedName == normalizedRoleName, GetCancellationToken(cancellationToken)); } - public async Task> GetListWithUserCountAsync( + public async Task> GetListWithUserCountAsync( string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, @@ -49,7 +49,7 @@ public class MongoIdentityRoleRepository : MongoDbRepository new RoleWithUserCount(role, userCount.FirstOrDefault(x => x.RoleId == role.Id)?.Count ?? 0)).ToList(); + return roles.Select(role => new IdentityRoleWithUserCount(role, userCount.FirstOrDefault(x => x.RoleId == role.Id)?.Count ?? 0)).ToList(); } public virtual async Task> GetListAsync(