diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/IAuditLogRepository.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/IAuditLogRepository.cs index e6dc042989..692862eec0 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/IAuditLogRepository.cs +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/IAuditLogRepository.cs @@ -18,6 +18,7 @@ public interface IAuditLogRepository : IRepository DateTime? endTime = null, string httpMethod = null, string url = null, + string clientId = null, Guid? userId = null, string userName = null, string applicationName = null, @@ -35,6 +36,7 @@ public interface IAuditLogRepository : IRepository DateTime? endTime = null, string httpMethod = null, string url = null, + string clientId = null, Guid? userId = null, string userName = null, string applicationName = null, diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs index 86ed8461e4..cbc16e10a7 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs @@ -29,6 +29,7 @@ public class EfCoreAuditLogRepository : EfCoreRepository auditLog.Exceptions == null || auditLog.Exceptions == "") .WhereIf(!httpMethod.IsNullOrEmpty(), auditLog => auditLog.HttpMethod == httpMethod) .WhereIf(!url.IsNullOrEmpty(), auditLog => auditLog.Url != null && auditLog.Url.Contains(url)) + .WhereIf(!clientId.IsNullOrEmpty(), auditLog => auditLog.ClientId == clientId) .WhereIf(userId != null, auditLog => auditLog.UserId == userId) .WhereIf(!userName.IsNullOrEmpty(), auditLog => auditLog.UserName == userName) .WhereIf(!applicationName.IsNullOrEmpty(), auditLog => auditLog.ApplicationName == applicationName) @@ -159,7 +165,7 @@ public class EfCoreAuditLogRepository : EfCoreRepository> WithDetailsAsync() + public async override Task> WithDetailsAsync() { return (await GetQueryableAsync()).IncludeDetails(); } diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs index 2ffdd20fd6..b406e83d5c 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs @@ -30,6 +30,7 @@ public class MongoAuditLogRepository : MongoDbRepository auditLog.Exceptions == null || auditLog.Exceptions == "") .WhereIf(!httpMethod.IsNullOrEmpty(), auditLog => auditLog.HttpMethod == httpMethod) .WhereIf(!url.IsNullOrEmpty(), auditLog => auditLog.Url != null && auditLog.Url.Contains(url)) + .WhereIf(!clientId.IsNullOrEmpty(), auditLog => auditLog.ClientId == clientId) .WhereIf(userId != null, auditLog => auditLog.UserId == userId) .WhereIf(!userName.IsNullOrEmpty(), auditLog => auditLog.UserName == userName) .WhereIf(!applicationName.IsNullOrEmpty(), auditLog => auditLog.ApplicationName == applicationName)