Browse Source

made slight query enhancment

pull/21989/head
Mansur Besleney 1 year ago
parent
commit
7e8c7aba45
  1. 8
      modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs
  2. 7
      modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs

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

@ -464,6 +464,11 @@ public class EfCoreIdentityUserRepository : EfCoreRepository<IIdentityDbContext,
query = query.Where(identityUser => identityUser.Roles.Any(x => x.RoleId == roleId.Value) || identityUser.OrganizationUnits.Any(x => organizationUnitIds.Contains(x.OrganizationUnitId)));
}
if (id.HasValue)
{
return query.Where(x => x.Id == id);
}
return query
.WhereIf(
!filter.IsNullOrWhiteSpace(),
@ -487,7 +492,6 @@ public class EfCoreIdentityUserRepository : EfCoreRepository<IIdentityDbContext,
.WhereIf(maxCreationTime != null, p => p.CreationTime <= maxCreationTime)
.WhereIf(minCreationTime != null, p => p.CreationTime >= minCreationTime)
.WhereIf(maxModifitionTime != null, p => p.LastModificationTime <= maxModifitionTime)
.WhereIf(minModifitionTime != null, p => p.LastModificationTime >= minModifitionTime)
.WhereIf(id.HasValue, x => x.Id == id);
.WhereIf(minModifitionTime != null, p => p.LastModificationTime >= minModifitionTime);
}
}

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

@ -459,6 +459,10 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
query = query.Where(identityUser => identityUser.Roles.Any(x => x.RoleId == roleId.Value) || identityUser.OrganizationUnits.Any(x => organizationUnitIds.Contains(x.OrganizationUnitId)));
}
if (id.HasValue)
{
return query.Where(x => x.Id == id);
}
return query
.WhereIf(
@ -484,7 +488,6 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
.WhereIf(maxCreationTime != null, p => p.CreationTime <= maxCreationTime)
.WhereIf(minCreationTime != null, p => p.CreationTime >= minCreationTime)
.WhereIf(maxModifitionTime != null, p => p.LastModificationTime <= maxModifitionTime)
.WhereIf(minModifitionTime != null, p => p.LastModificationTime >= minModifitionTime)
.WhereIf(id.HasValue, x => x.Id == id);
.WhereIf(minModifitionTime != null, p => p.LastModificationTime >= minModifitionTime);
}
}
Loading…
Cancel
Save