From bb9971ac29f1459ff0d26d687750e8ca6d23bee0 Mon Sep 17 00:00:00 2001 From: Michael Wang Date: Wed, 12 May 2021 10:16:19 +0800 Subject: [PATCH] Add Null check for Name and Surname --- .../EfCoreAbpUserRepositoryBase.cs | 12 ++++++------ .../Abp/Users/MongoDB/MongoUserRepositoryBase.cs | 12 ++++++------ 2 files changed, 12 insertions(+), 12 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 529af15778..635d9fc8fd 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 @@ -44,9 +44,9 @@ namespace Volo.Abp.Users.EntityFrameworkCore !filter.IsNullOrWhiteSpace(), u => u.UserName.Contains(filter) || - u.Email.Contains(filter) || - u.Name.Contains(filter) || - u.Surname.Contains(filter) + (u.Email != null && u.Email.Contains(filter)) || + (u.Name != null && u.Name.Contains(filter)) || + (u.Surname != null && u.Surname.Contains(filter)) ) .OrderBy(sorting.IsNullOrEmpty() ? nameof(IUser.UserName) : sorting) .PageBy(skipCount, maxResultCount) @@ -62,9 +62,9 @@ namespace Volo.Abp.Users.EntityFrameworkCore !filter.IsNullOrWhiteSpace(), u => u.UserName.Contains(filter) || - u.Email.Contains(filter) || - u.Name.Contains(filter) || - u.Surname.Contains(filter) + (u.Email != null && u.Email.Contains(filter)) || + (u.Name != null && u.Name.Contains(filter)) || + (u.Surname != null && u.Surname.Contains(filter)) ) .LongCountAsync(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 a24cb3b788..14fa2ea6d0 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 @@ -50,9 +50,9 @@ namespace Volo.Abp.Users.MongoDB !filter.IsNullOrWhiteSpace(), u => u.UserName.Contains(filter) || - u.Email.Contains(filter) || - u.Name.Contains(filter) || - u.Surname.Contains(filter) + (u.Email != null && u.Email.Contains(filter)) || + (u.Name != null && u.Name.Contains(filter)) || + (u.Surname != null && u.Surname.Contains(filter)) ) .OrderBy(sorting.IsNullOrEmpty() ? nameof(IUserData.UserName) : sorting) .As>() @@ -68,9 +68,9 @@ namespace Volo.Abp.Users.MongoDB !filter.IsNullOrWhiteSpace(), u => u.UserName.Contains(filter) || - u.Email.Contains(filter) || - u.Name.Contains(filter) || - u.Surname.Contains(filter) + (u.Email != null && u.Email.Contains(filter)) || + (u.Name != null && u.Name.Contains(filter)) || + (u.Surname != null && u.Surname.Contains(filter)) ) .LongCountAsync(cancellationToken); }