Merge pull request #8988 from GotzeWong/dev

Add Null check for Name and Surname

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

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<IMongoQueryable<TUser>>()
@@ -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);
         }