From 07d76153239fafff1dd94b2cb07f62a8aa9b3451 Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 24 Mar 2021 09:40:24 +0300 Subject: [PATCH 1/5] Check NullOrEmpty for sortings instead of null coalescing in CmsKit --- .../Volo/CmsKit/Blogs/EfCoreBlogPostRepository.cs | 2 +- .../Volo/CmsKit/Blogs/EfCoreBlogRepository.cs | 2 +- .../Volo/CmsKit/Comments/EfCoreCommentRepository.cs | 2 +- .../Volo/CmsKit/Pages/EfCorePageRepository.cs | 2 +- .../Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs | 2 +- .../Volo/CmsKit/MongoDB/Blogs/MongoBlogRepository.cs | 2 +- .../Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs | 2 +- .../Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogPostRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogPostRepository.cs index 92463ed891..2b2bdcffb7 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogPostRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogPostRepository.cs @@ -68,7 +68,7 @@ namespace Volo.CmsKit.Blogs .WhereIf(blogId.HasValue, x => x.BlogId == blogId) .WhereIf(!string.IsNullOrWhiteSpace(filter), x => x.Title.Contains(filter) || x.Slug.Contains(filter)); - queryable = queryable.OrderBy(sorting ?? $"{nameof(BlogPost.CreationTime)} desc"); + queryable = queryable.OrderBy(sorting.IsNullOrEmpty() ? $"{nameof(BlogPost.CreationTime)} desc" : sorting); var combinedResult = await queryable .Join( diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogRepository.cs index bfcb6d3cab..ca63dc878b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogRepository.cs @@ -38,7 +38,7 @@ namespace Volo.CmsKit.Blogs { var query = await GetListQueryAsync(filter); - return await query.OrderBy(sorting ?? "creationTime desc") + return await query.OrderBy(sorting.IsNullOrEmpty() ? "creationTime desc" : sorting) .PageBy(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); } diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Comments/EfCoreCommentRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Comments/EfCoreCommentRepository.cs index 8ca73426be..3b718f774e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Comments/EfCoreCommentRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Comments/EfCoreCommentRepository.cs @@ -74,7 +74,7 @@ namespace Volo.CmsKit.Comments sorting = "comment." + sorting; } - query = query.OrderBy(sorting ?? "comment.creationTime desc") + query = query.OrderBy(sorting.IsNullOrEmpty() ? "comment.creationTime desc" : sorting) .PageBy(skipCount, maxResultCount); return await query.ToListAsync(token); diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs index d1d5578c02..5651fa99a7 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs @@ -40,7 +40,7 @@ namespace Volo.CmsKit.Pages !filter.IsNullOrWhiteSpace(), x => x.Title.Contains(filter)) - .OrderBy(sorting ?? nameof(Page.Title)) + .OrderBy(sorting.IsNullOrEmpty() ? nameof(Page.Title) : sorting) .PageBy(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); } diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs index ee0b41d08a..b0dfb01ecd 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs @@ -71,7 +71,7 @@ namespace Volo.CmsKit.MongoDB.Blogs .WhereIf(blogId.HasValue, x => x.BlogId == blogId) .WhereIf(!string.IsNullOrWhiteSpace(filter), x => x.Title.Contains(filter) || x.Slug.Contains(filter)); - queryable = queryable.OrderBy(sorting ?? $"{nameof(BlogPost.CreationTime)} desc"); + queryable = queryable.OrderBy(sorting.IsNullOrEmpty() ? $"{nameof(BlogPost.CreationTime)} desc" : sorting); var combinedQueryable = queryable .Join( diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogRepository.cs index 32119610bb..1c498f9f9c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogRepository.cs @@ -43,7 +43,7 @@ namespace Volo.CmsKit.MongoDB.Blogs var query = await GetListQueryAsync(filter, token); - return await query.OrderBy(sorting ?? "creationTime desc") + return await query.OrderBy(sorting.IsNullOrEmpty() ? "creationTime desc" : sorting) .As>() .PageBy>(skipCount, maxResultCount) .ToListAsync(token); diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs index 6c3158b0e5..1fc4feab43 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs @@ -67,7 +67,7 @@ namespace Volo.CmsKit.MongoDB.Comments creationEndDate, token); - var comments = await query.OrderBy(sorting ?? "creationTime desc") + var comments = await query.OrderBy(sorting.IsNullOrEmpty() ? "creationTime desc" : sorting) .As>() .PageBy>(skipCount, maxResultCount) .ToListAsync(token); diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs index ec520fe809..bbe9ea8ae7 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs @@ -49,7 +49,7 @@ namespace Volo.CmsKit.MongoDB.Pages u => u.Title.Contains(filter) ) - .OrderBy(sorting ?? nameof(Page.Title)) + .OrderBy(sorting.IsNullOrEmpty() ? nameof(Page.Title) : sorting) .As>() .PageBy>(skipCount, maxResultCount) .ToListAsync(cancellation); From 93deac77f1c04547432154d38033dd26d4f0f1e7 Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 24 Mar 2021 09:45:39 +0300 Subject: [PATCH 2/5] Check NullOrEmpty for sortings instead of null coalescing in Docs --- .../Volo/Docs/Projects/EfCoreProjectRepository.cs | 2 +- .../Volo/Docs/Projects/MongoProjectRepository.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Projects/EfCoreProjectRepository.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Projects/EfCoreProjectRepository.cs index 294241c992..ed3ffe9922 100644 --- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Projects/EfCoreProjectRepository.cs +++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Projects/EfCoreProjectRepository.cs @@ -21,7 +21,7 @@ namespace Volo.Docs.Projects public async Task> GetListAsync(string sorting, int maxResultCount, int skipCount, CancellationToken cancellationToken = default) { - var projects = await (await GetDbSetAsync()).OrderBy(sorting ?? "Id desc") + var projects = await (await GetDbSetAsync()).OrderBy(sorting.IsNullOrEmpty() ? "Id desc" : sorting) .PageBy(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Projects/MongoProjectRepository.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Projects/MongoProjectRepository.cs index 99aa5a99dd..ffcff56055 100644 --- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Projects/MongoProjectRepository.cs +++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Projects/MongoProjectRepository.cs @@ -22,7 +22,7 @@ namespace Volo.Docs.Projects public async Task> GetListAsync(string sorting, int maxResultCount, int skipCount, CancellationToken cancellationToken = default) { - var projects = await (await GetMongoQueryableAsync(cancellationToken)).OrderBy(sorting ?? "Id desc").As>() + var projects = await (await GetMongoQueryableAsync(cancellationToken)).OrderBy(sorting.IsNullOrEmpty() ? "Id desc" : sorting).As>() .PageBy>(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); From 77f7fc64d956e44303b1e4d75e395be180a1e4b8 Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 24 Mar 2021 09:49:57 +0300 Subject: [PATCH 3/5] Check NullOrEmpty for sortings instead of null coalescing in Identity --- .../EfCoreOrganizationUnitRepository.cs | 10 +++++----- .../MongoDB/MongoOrganizationUnitRepository.cs | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs index 6a54f41959..908da0a89b 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs @@ -53,7 +53,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore { return await (await GetDbSetAsync()) .IncludeDetails(includeDetails) - .OrderBy(sorting ?? nameof(OrganizationUnit.DisplayName)) + .OrderBy(sorting.IsNullOrEmpty() ? nameof(OrganizationUnit.DisplayName) : sorting) .PageBy(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); } @@ -99,7 +99,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore select role; query = query - .OrderBy(sorting ?? nameof(IdentityRole.Name)) + .OrderBy(sorting.IsNullOrEmpty() ? nameof(IdentityRole.Name) : sorting) .PageBy(skipCount, maxResultCount); return await query.ToListAsync(GetCancellationToken(cancellationToken)); @@ -135,7 +135,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore .Where(r => !roleIds.Contains(r.Id)) .IncludeDetails(includeDetails) .WhereIf(!filter.IsNullOrWhiteSpace(), r => r.Name.Contains(filter)) - .OrderBy(sorting ?? nameof(IdentityRole.Name)) + .OrderBy(sorting.IsNullOrEmpty() ? nameof(IdentityRole.Name) : sorting) .PageBy(skipCount, maxResultCount) .ToListAsync(cancellationToken); } @@ -165,7 +165,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore { var query = await CreateGetMembersFilteredQueryAsync(organizationUnit, filter); - return await query.IncludeDetails(includeDetails).OrderBy(sorting ?? nameof(IdentityUser.UserName)) + return await query.IncludeDetails(includeDetails).OrderBy(sorting.IsNullOrEmpty() ? nameof(IdentityUser.UserName) : sorting) .PageBy(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); } @@ -209,7 +209,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore return await query .IncludeDetails(includeDetails) - .OrderBy(sorting ?? nameof(IdentityUser.Name)) + .OrderBy(sorting.IsNullOrEmpty() ? nameof(IdentityUser.Name) : sorting) .PageBy(skipCount, maxResultCount) .ToListAsync(cancellationToken); } diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs index 6479bc4be0..60c30721cb 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs @@ -61,7 +61,7 @@ namespace Volo.Abp.Identity.MongoDB CancellationToken cancellationToken = default) { return await (await GetMongoQueryableAsync(cancellationToken)) - .OrderBy(sorting ?? nameof(OrganizationUnit.DisplayName)) + .OrderBy(sorting.IsNullOrEmpty() ? nameof(OrganizationUnit.DisplayName) : sorting) .As>() .PageBy>(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); @@ -93,7 +93,7 @@ namespace Volo.Abp.Identity.MongoDB return await ApplyDataFilters, IdentityRole>( dbContext.Roles.AsQueryable().Where(r => roleIds.Contains(r.Id)) ) - .OrderBy(sorting ?? nameof(IdentityRole.Name)) + .OrderBy(sorting.IsNullOrEmpty() ? nameof(IdentityRole.Name) : sorting) .As>() .PageBy>(skipCount, maxResultCount) .ToListAsync(cancellationToken); @@ -126,7 +126,7 @@ namespace Volo.Abp.Identity.MongoDB return await ApplyDataFilters, IdentityRole>(dbContext.Roles.AsQueryable()) .Where(r => !roleIds.Contains(r.Id)) .WhereIf(!filter.IsNullOrWhiteSpace(), r => r.Name.Contains(filter)) - .OrderBy(sorting ?? nameof(IdentityRole.Name)) + .OrderBy(sorting.IsNullOrEmpty() ? nameof(IdentityRole.Name) : sorting) .As>() .PageBy>(skipCount, maxResultCount) .ToListAsync(cancellationToken); @@ -158,7 +158,7 @@ namespace Volo.Abp.Identity.MongoDB cancellationToken = GetCancellationToken(cancellationToken); var query = await CreateGetMembersFilteredQueryAsync(organizationUnit, filter, cancellationToken); return await query - .OrderBy(sorting ?? nameof(IdentityUser.UserName)) + .OrderBy(sorting.IsNullOrEmpty() ? nameof(IdentityUser.UserName) : sorting) .As>() .PageBy>(skipCount, maxResultCount) .ToListAsync(cancellationToken); @@ -193,7 +193,7 @@ namespace Volo.Abp.Identity.MongoDB u.Email.Contains(filter) || (u.PhoneNumber != null && u.PhoneNumber.Contains(filter)) ) - .OrderBy(sorting ?? nameof(IdentityUser.UserName)) + .OrderBy(sorting.IsNullOrEmpty() ? nameof(IdentityUser.UserName) : sorting) .As>() .PageBy>(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); From 4948fca516d905b2f3069381b069425d14ccade7 Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 24 Mar 2021 09:52:40 +0300 Subject: [PATCH 4/5] Check NullOrEmpty for sortings instead of null coalescing in TenantManagement --- .../EntityFrameworkCore/EfCoreTenantRepository.cs | 2 +- .../Volo/Abp/TenantManagement/MongoDb/MongoTenantRepository.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/EfCoreTenantRepository.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/EfCoreTenantRepository.cs index 18b82bb8be..5da11fe767 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/EfCoreTenantRepository.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/EfCoreTenantRepository.cs @@ -62,7 +62,7 @@ namespace Volo.Abp.TenantManagement.EntityFrameworkCore u => u.Name.Contains(filter) ) - .OrderBy(sorting ?? nameof(Tenant.Name)) + .OrderBy(sorting.IsNullOrEmpty() ? nameof(Tenant.Name) : sorting) .PageBy(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); } diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/MongoTenantRepository.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/MongoTenantRepository.cs index a2805f7333..96d997e417 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/MongoTenantRepository.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/MongoTenantRepository.cs @@ -56,7 +56,7 @@ namespace Volo.Abp.TenantManagement.MongoDB u => u.Name.Contains(filter) ) - .OrderBy(sorting ?? nameof(Tenant.Name)) + .OrderBy(sorting.IsNullOrEmpty() ? nameof(Tenant.Name) : sorting) .As>() .PageBy>(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); From 335713c2faf4c90da92456dda7f6f1375f1d6c74 Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 24 Mar 2021 09:54:41 +0300 Subject: [PATCH 5/5] Check NullOrEmpty for sortings instead of null coalescing in Users --- .../Users/EntityFrameworkCore/EfCoreAbpUserRepositoryBase.cs | 2 +- .../Volo/Abp/Users/MongoDB/MongoUserRepositoryBase.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo/Abp/Users/EntityFrameworkCore/EfCoreAbpUserRepositoryBase.cs b/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo/Abp/Users/EntityFrameworkCore/EfCoreAbpUserRepositoryBase.cs index de27a05fbd..529af15778 100644 --- a/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo/Abp/Users/EntityFrameworkCore/EfCoreAbpUserRepositoryBase.cs +++ b/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo/Abp/Users/EntityFrameworkCore/EfCoreAbpUserRepositoryBase.cs @@ -48,7 +48,7 @@ namespace Volo.Abp.Users.EntityFrameworkCore u.Name.Contains(filter) || u.Surname.Contains(filter) ) - .OrderBy(sorting ?? nameof(IUser.UserName)) + .OrderBy(sorting.IsNullOrEmpty() ? nameof(IUser.UserName) : sorting) .PageBy(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); } diff --git a/modules/users/src/Volo.Abp.Users.MongoDB/Volo/Abp/Users/MongoDB/MongoUserRepositoryBase.cs b/modules/users/src/Volo.Abp.Users.MongoDB/Volo/Abp/Users/MongoDB/MongoUserRepositoryBase.cs index 996b6e314c..a24cb3b788 100644 --- a/modules/users/src/Volo.Abp.Users.MongoDB/Volo/Abp/Users/MongoDB/MongoUserRepositoryBase.cs +++ b/modules/users/src/Volo.Abp.Users.MongoDB/Volo/Abp/Users/MongoDB/MongoUserRepositoryBase.cs @@ -54,7 +54,7 @@ namespace Volo.Abp.Users.MongoDB u.Name.Contains(filter) || u.Surname.Contains(filter) ) - .OrderBy(sorting ?? nameof(IUserData.UserName)) + .OrderBy(sorting.IsNullOrEmpty() ? nameof(IUserData.UserName) : sorting) .As>() .PageBy>(skipCount, maxResultCount) .ToListAsync(cancellationToken);