From 335713c2faf4c90da92456dda7f6f1375f1d6c74 Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 24 Mar 2021 09:54:41 +0300 Subject: [PATCH] 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);