Browse Source

Add Null check for Name and Surname

pull/8988/head
Michael Wang 5 years ago
parent
commit
bb9971ac29
  1. 12
      modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo/Abp/Users/EntityFrameworkCore/EfCoreAbpUserRepositoryBase.cs
  2. 12
      modules/users/src/Volo.Abp.Users.MongoDB/Volo/Abp/Users/MongoDB/MongoUserRepositoryBase.cs

12
modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo/Abp/Users/EntityFrameworkCore/EfCoreAbpUserRepositoryBase.cs

@ -44,9 +44,9 @@ namespace Volo.Abp.Users.EntityFrameworkCore
!filter.IsNullOrWhiteSpace(), !filter.IsNullOrWhiteSpace(),
u => u =>
u.UserName.Contains(filter) || u.UserName.Contains(filter) ||
u.Email.Contains(filter) || (u.Email != null && u.Email.Contains(filter)) ||
u.Name.Contains(filter) || (u.Name != null && u.Name.Contains(filter)) ||
u.Surname.Contains(filter) (u.Surname != null && u.Surname.Contains(filter))
) )
.OrderBy(sorting.IsNullOrEmpty() ? nameof(IUser.UserName) : sorting) .OrderBy(sorting.IsNullOrEmpty() ? nameof(IUser.UserName) : sorting)
.PageBy(skipCount, maxResultCount) .PageBy(skipCount, maxResultCount)
@ -62,9 +62,9 @@ namespace Volo.Abp.Users.EntityFrameworkCore
!filter.IsNullOrWhiteSpace(), !filter.IsNullOrWhiteSpace(),
u => u =>
u.UserName.Contains(filter) || u.UserName.Contains(filter) ||
u.Email.Contains(filter) || (u.Email != null && u.Email.Contains(filter)) ||
u.Name.Contains(filter) || (u.Name != null && u.Name.Contains(filter)) ||
u.Surname.Contains(filter) (u.Surname != null && u.Surname.Contains(filter))
) )
.LongCountAsync(GetCancellationToken(cancellationToken)); .LongCountAsync(GetCancellationToken(cancellationToken));
} }

12
modules/users/src/Volo.Abp.Users.MongoDB/Volo/Abp/Users/MongoDB/MongoUserRepositoryBase.cs

@ -50,9 +50,9 @@ namespace Volo.Abp.Users.MongoDB
!filter.IsNullOrWhiteSpace(), !filter.IsNullOrWhiteSpace(),
u => u =>
u.UserName.Contains(filter) || u.UserName.Contains(filter) ||
u.Email.Contains(filter) || (u.Email != null && u.Email.Contains(filter)) ||
u.Name.Contains(filter) || (u.Name != null && u.Name.Contains(filter)) ||
u.Surname.Contains(filter) (u.Surname != null && u.Surname.Contains(filter))
) )
.OrderBy(sorting.IsNullOrEmpty() ? nameof(IUserData.UserName) : sorting) .OrderBy(sorting.IsNullOrEmpty() ? nameof(IUserData.UserName) : sorting)
.As<IMongoQueryable<TUser>>() .As<IMongoQueryable<TUser>>()
@ -68,9 +68,9 @@ namespace Volo.Abp.Users.MongoDB
!filter.IsNullOrWhiteSpace(), !filter.IsNullOrWhiteSpace(),
u => u =>
u.UserName.Contains(filter) || u.UserName.Contains(filter) ||
u.Email.Contains(filter) || (u.Email != null && u.Email.Contains(filter)) ||
u.Name.Contains(filter) || (u.Name != null && u.Name.Contains(filter)) ||
u.Surname.Contains(filter) (u.Surname != null && u.Surname.Contains(filter))
) )
.LongCountAsync(cancellationToken); .LongCountAsync(cancellationToken);
} }

Loading…
Cancel
Save