Browse Source

Using ToUpperInvariant

pull/17720/head
liangshiwei 3 years ago
parent
commit
f0836c3e63
  1. 4
      modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs
  2. 10
      modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs

4
modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs

@ -174,7 +174,7 @@ public class EfCoreIdentityUserRepository : EfCoreRepository<IIdentityDbContext,
DateTime? minModifitionTime = null, DateTime? minModifitionTime = null,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
var upperFilter = filter?.ToUpper(); var upperFilter = filter?.ToUpperInvariant();
return await (await GetDbSetAsync()) return await (await GetDbSetAsync())
.IncludeDetails(includeDetails) .IncludeDetails(includeDetails)
.WhereIf( .WhereIf(
@ -256,7 +256,7 @@ public class EfCoreIdentityUserRepository : EfCoreRepository<IIdentityDbContext,
DateTime? minModifitionTime = null, DateTime? minModifitionTime = null,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
var upperFilter = filter?.ToUpper(); var upperFilter = filter?.ToUpperInvariant();
return await (await GetDbSetAsync()) return await (await GetDbSetAsync())
.WhereIf( .WhereIf(
!filter.IsNullOrWhiteSpace(), !filter.IsNullOrWhiteSpace(),

10
modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs

@ -155,12 +155,13 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
DateTime? minModifitionTime = null, DateTime? minModifitionTime = null,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
var upperFilter = filter?.ToUpperInvariant();
return await (await GetMongoQueryableAsync(cancellationToken)) return await (await GetMongoQueryableAsync(cancellationToken))
.WhereIf<IdentityUser, IMongoQueryable<IdentityUser>>( .WhereIf<IdentityUser, IMongoQueryable<IdentityUser>>(
!filter.IsNullOrWhiteSpace(), !filter.IsNullOrWhiteSpace(),
u => u =>
u.UserName.Contains(filter) || u.NormalizedUserName.Contains(upperFilter) ||
u.Email.Contains(filter) || u.NormalizedEmail.Contains(upperFilter) ||
(u.Name != null && u.Name.Contains(filter)) || (u.Name != null && u.Name.Contains(filter)) ||
(u.Surname != null && u.Surname.Contains(filter)) || (u.Surname != null && u.Surname.Contains(filter)) ||
(u.PhoneNumber != null && u.PhoneNumber.Contains(filter)) (u.PhoneNumber != null && u.PhoneNumber.Contains(filter))
@ -240,12 +241,13 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
DateTime? minModifitionTime = null, DateTime? minModifitionTime = null,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
var upperFilter = filter?.ToUpperInvariant();
return await (await GetMongoQueryableAsync(cancellationToken)) return await (await GetMongoQueryableAsync(cancellationToken))
.WhereIf<IdentityUser, IMongoQueryable<IdentityUser>>( .WhereIf<IdentityUser, IMongoQueryable<IdentityUser>>(
!filter.IsNullOrWhiteSpace(), !filter.IsNullOrWhiteSpace(),
u => u =>
u.UserName.Contains(filter) || u.NormalizedUserName.Contains(upperFilter) ||
u.Email.Contains(filter) || u.NormalizedEmail.Contains(upperFilter) ||
(u.Name != null && u.Name.Contains(filter)) || (u.Name != null && u.Name.Contains(filter)) ||
(u.Surname != null && u.Surname.Contains(filter)) || (u.Surname != null && u.Surname.Contains(filter)) ||
(u.PhoneNumber != null && u.PhoneNumber.Contains(filter)) (u.PhoneNumber != null && u.PhoneNumber.Contains(filter))

Loading…
Cancel
Save