Browse Source

fix date filtering

pull/4901/head
Ahmet Çotur 6 years ago
parent
commit
727c519ac9
  1. 4
      modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EFCoreIdentitySecurityLogRepository.cs
  2. 4
      modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentitySecurityLogRepository.cs

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

@ -95,8 +95,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
string correlationId = null) string correlationId = null)
{ {
return DbSet.AsNoTracking() return DbSet.AsNoTracking()
.WhereIf(startTime.HasValue, securityLog => securityLog.CreationTime >= startTime) .WhereIf(startTime.HasValue, securityLog => securityLog.CreationTime.Date >= startTime.Value.Date)
.WhereIf(endTime.HasValue, securityLog => securityLog.CreationTime >= endTime) .WhereIf(endTime.HasValue, securityLog => securityLog.CreationTime.Date <= endTime.Value.Date)
.WhereIf(!applicationName.IsNullOrWhiteSpace(), securityLog => securityLog.ApplicationName == applicationName) .WhereIf(!applicationName.IsNullOrWhiteSpace(), securityLog => securityLog.ApplicationName == applicationName)
.WhereIf(!identity.IsNullOrWhiteSpace(), securityLog => securityLog.Identity == identity) .WhereIf(!identity.IsNullOrWhiteSpace(), securityLog => securityLog.Identity == identity)
.WhereIf(!action.IsNullOrWhiteSpace(), securityLog => securityLog.Action == action) .WhereIf(!action.IsNullOrWhiteSpace(), securityLog => securityLog.Action == action)

4
modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentitySecurityLogRepository.cs

@ -101,8 +101,8 @@ namespace Volo.Abp.Identity.MongoDB
string correlationId = null) string correlationId = null)
{ {
return GetMongoQueryable() return GetMongoQueryable()
.WhereIf(startTime.HasValue, securityLog => securityLog.CreationTime >= startTime) .WhereIf(startTime.HasValue, securityLog => securityLog.CreationTime.Date >= startTime.Value.Date)
.WhereIf(endTime.HasValue, securityLog => securityLog.CreationTime >= endTime) .WhereIf(endTime.HasValue, securityLog => securityLog.CreationTime.Date <= endTime.Value.Date)
.WhereIf(!applicationName.IsNullOrWhiteSpace(), .WhereIf(!applicationName.IsNullOrWhiteSpace(),
securityLog => securityLog.ApplicationName == applicationName) securityLog => securityLog.ApplicationName == applicationName)
.WhereIf(!identity.IsNullOrWhiteSpace(), securityLog => securityLog.Identity == identity) .WhereIf(!identity.IsNullOrWhiteSpace(), securityLog => securityLog.Identity == identity)

Loading…
Cancel
Save