Browse Source
Merge pull request #4901 from abpframework/fix/security-logs
Fix Date Filtering on IdentitySecurityLogRepository
pull/4910/head
maliming
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
4 deletions
-
modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EFCoreIdentitySecurityLogRepository.cs
-
modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentitySecurityLogRepository.cs
|
|
|
@ -95,8 +95,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore |
|
|
|
string correlationId = null) |
|
|
|
{ |
|
|
|
return DbSet.AsNoTracking() |
|
|
|
.WhereIf(startTime.HasValue, securityLog => securityLog.CreationTime >= startTime) |
|
|
|
.WhereIf(endTime.HasValue, securityLog => securityLog.CreationTime >= endTime) |
|
|
|
.WhereIf(startTime.HasValue, securityLog => securityLog.CreationTime >= startTime.Value) |
|
|
|
.WhereIf(endTime.HasValue, securityLog => securityLog.CreationTime < endTime.Value.AddDays(1).Date) |
|
|
|
.WhereIf(!applicationName.IsNullOrWhiteSpace(), securityLog => securityLog.ApplicationName == applicationName) |
|
|
|
.WhereIf(!identity.IsNullOrWhiteSpace(), securityLog => securityLog.Identity == identity) |
|
|
|
.WhereIf(!action.IsNullOrWhiteSpace(), securityLog => securityLog.Action == action) |
|
|
|
|
|
|
|
@ -101,8 +101,8 @@ namespace Volo.Abp.Identity.MongoDB |
|
|
|
string correlationId = null) |
|
|
|
{ |
|
|
|
return GetMongoQueryable() |
|
|
|
.WhereIf(startTime.HasValue, securityLog => securityLog.CreationTime >= startTime) |
|
|
|
.WhereIf(endTime.HasValue, securityLog => securityLog.CreationTime >= endTime) |
|
|
|
.WhereIf(startTime.HasValue, securityLog => securityLog.CreationTime >= startTime.Value) |
|
|
|
.WhereIf(endTime.HasValue, securityLog => securityLog.CreationTime < endTime.Value.AddDays(1).Date) |
|
|
|
.WhereIf(!applicationName.IsNullOrWhiteSpace(), |
|
|
|
securityLog => securityLog.ApplicationName == applicationName) |
|
|
|
.WhereIf(!identity.IsNullOrWhiteSpace(), securityLog => securityLog.Identity == identity) |
|
|
|
|
