Browse Source

Check NullOrEmpty for sortings instead of null coalescing in Users

pull/8178/head
enisn 5 years ago
parent
commit
335713c2fa
  1. 2
      modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo/Abp/Users/EntityFrameworkCore/EfCoreAbpUserRepositoryBase.cs
  2. 2
      modules/users/src/Volo.Abp.Users.MongoDB/Volo/Abp/Users/MongoDB/MongoUserRepositoryBase.cs

2
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));
}

2
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<IMongoQueryable<TUser>>()
.PageBy<TUser, IMongoQueryable<TUser>>(skipCount, maxResultCount)
.ToListAsync(cancellationToken);

Loading…
Cancel
Save