Merge pull request #18505 from abpframework/auto-merge/rel-8-0/2366

Merge branch dev with rel-8.0

modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs

@@ -126,13 +126,13 @@ public class EfCoreAuditLogRepository : EfCoreRepository<IAuditLoggingDbContext,
             .WhereIf(endTime.HasValue, auditLog => auditLog.ExecutionTime <= endTime)
             .WhereIf(hasException.HasValue && hasException.Value, auditLog => auditLog.Exceptions != null && auditLog.Exceptions != "")
             .WhereIf(hasException.HasValue && !hasException.Value, auditLog => auditLog.Exceptions == null || auditLog.Exceptions == "")
-            .WhereIf(httpMethod != null, auditLog => auditLog.HttpMethod == httpMethod)
-            .WhereIf(url != null, auditLog => auditLog.Url != null && auditLog.Url.Contains(url))
+            .WhereIf(!httpMethod.IsNullOrEmpty(), auditLog => auditLog.HttpMethod == httpMethod)
+            .WhereIf(!url.IsNullOrEmpty(), auditLog => auditLog.Url != null && auditLog.Url.Contains(url))
             .WhereIf(userId != null, auditLog => auditLog.UserId == userId)
-            .WhereIf(userName != null, auditLog => auditLog.UserName == userName)
-            .WhereIf(applicationName != null, auditLog => auditLog.ApplicationName == applicationName)
-            .WhereIf(clientIpAddress != null, auditLog => auditLog.ClientIpAddress != null && auditLog.ClientIpAddress == clientIpAddress)
-            .WhereIf(correlationId != null, auditLog => auditLog.CorrelationId == correlationId)
+            .WhereIf(!userName.IsNullOrEmpty(), auditLog => auditLog.UserName == userName)
+            .WhereIf(!applicationName.IsNullOrEmpty(), auditLog => auditLog.ApplicationName == applicationName)
+            .WhereIf(!clientIpAddress.IsNullOrEmpty(), auditLog => auditLog.ClientIpAddress != null && auditLog.ClientIpAddress == clientIpAddress)
+            .WhereIf(!correlationId.IsNullOrEmpty(), auditLog => auditLog.CorrelationId == correlationId)
             .WhereIf(httpStatusCode != null && httpStatusCode > 0, auditLog => auditLog.HttpStatusCode == nHttpStatusCode)
             .WhereIf(maxExecutionDuration != null && maxExecutionDuration.Value > 0, auditLog => auditLog.ExecutionDuration <= maxExecutionDuration)
             .WhereIf(minExecutionDuration != null && minExecutionDuration.Value > 0, auditLog => auditLog.ExecutionDuration >= minExecutionDuration);

modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs

@@ -128,13 +128,13 @@ public class MongoAuditLogRepository : MongoDbRepository<IAuditLoggingMongoDbCon
             .WhereIf(endTime.HasValue, auditLog => auditLog.ExecutionTime <= endTime)
             .WhereIf(hasException.HasValue && hasException.Value, auditLog => auditLog.Exceptions != null && auditLog.Exceptions != "")
             .WhereIf(hasException.HasValue && !hasException.Value, auditLog => auditLog.Exceptions == null || auditLog.Exceptions == "")
-            .WhereIf(httpMethod != null, auditLog => auditLog.HttpMethod == httpMethod)
-            .WhereIf(url != null, auditLog => auditLog.Url != null && auditLog.Url.Contains(url))
+            .WhereIf(!httpMethod.IsNullOrEmpty(), auditLog => auditLog.HttpMethod == httpMethod)
+            .WhereIf(!url.IsNullOrEmpty(), auditLog => auditLog.Url != null && auditLog.Url.Contains(url))
             .WhereIf(userId != null, auditLog => auditLog.UserId == userId)
-            .WhereIf(userName != null, auditLog => auditLog.UserName == userName)
-            .WhereIf(applicationName != null, auditLog => auditLog.ApplicationName == applicationName)
-            .WhereIf(clientIpAddress != null, auditLog => auditLog.ClientIpAddress == clientIpAddress)
-            .WhereIf(correlationId != null, auditLog => auditLog.CorrelationId == correlationId)
+            .WhereIf(!userName.IsNullOrEmpty(), auditLog => auditLog.UserName == userName)
+            .WhereIf(!applicationName.IsNullOrEmpty(), auditLog => auditLog.ApplicationName == applicationName)
+            .WhereIf(!clientIpAddress.IsNullOrEmpty(), auditLog => auditLog.ClientIpAddress == clientIpAddress)
+            .WhereIf(!correlationId.IsNullOrEmpty(), auditLog => auditLog.CorrelationId == correlationId)
             .WhereIf(httpStatusCode != null && httpStatusCode > 0, auditLog => auditLog.HttpStatusCode == (int?)httpStatusCode)
             .WhereIf(maxDuration != null && maxDuration > 0, auditLog => auditLog.ExecutionDuration <= maxDuration)
             .WhereIf(minDuration != null && minDuration > 0, auditLog => auditLog.ExecutionDuration >= minDuration);