From 547b78b72f6cf45febaac3bad55185e667283cad Mon Sep 17 00:00:00 2001 From: SuhorukovAnton Date: Wed, 19 Jan 2022 16:36:03 +0300 Subject: [PATCH] analizators/2178 --- common/services/ASC.AuditTrail/AuditEventsRepository.cs | 2 +- common/services/ASC.AuditTrail/LoginEventsRepository.cs | 2 +- .../ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/services/ASC.AuditTrail/AuditEventsRepository.cs b/common/services/ASC.AuditTrail/AuditEventsRepository.cs index 00727d4ced..ca9c60a4fe 100644 --- a/common/services/ASC.AuditTrail/AuditEventsRepository.cs +++ b/common/services/ASC.AuditTrail/AuditEventsRepository.cs @@ -86,7 +86,7 @@ namespace ASC.AuditTrail if (fromDate.HasValue && to.HasValue) { - query = query.Where(q => q.AuditEvent.Date >= fromDate & q.AuditEvent.Date <= to); + query = query.Where(q => q.AuditEvent.Date >= fromDate && q.AuditEvent.Date <= to); } if (limit.HasValue) diff --git a/common/services/ASC.AuditTrail/LoginEventsRepository.cs b/common/services/ASC.AuditTrail/LoginEventsRepository.cs index 78b913da76..a364647bfb 100644 --- a/common/services/ASC.AuditTrail/LoginEventsRepository.cs +++ b/common/services/ASC.AuditTrail/LoginEventsRepository.cs @@ -101,7 +101,7 @@ namespace ASC.AuditTrail.Data if (from.HasValue && to.HasValue) { - query = query.Where(l => l.Date >= from & l.Date <= to); + query = query.Where(l => l.Date >= from && l.Date <= to); } return query.Count(); diff --git a/products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs b/products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs index 8a357e95d5..ef33da3615 100644 --- a/products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs +++ b/products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs @@ -83,7 +83,7 @@ namespace ASC.Web.Files .Join(FilesDbContext.BunchObjects, a => a.tree.ParentId.ToString(), b => b.LeftNode, (fileTree, bunch) => new { fileTree.file, fileTree.tree, bunch }) .Where(r => r.file.TenantId == r.bunch.TenantId) .Where(r => r.file.TenantId == TenantManager.GetCurrentTenant().TenantId) - .Where(r => r.bunch.RightNode.StartsWith("files/my/") | r.bunch.RightNode.StartsWith("files/trash/")) + .Where(r => r.bunch.RightNode.StartsWith("files/my/") || r.bunch.RightNode.StartsWith("files/trash/")) .GroupBy(r => r.file.CreateBy) .Select(r => new { CreateBy = r.Key, Size = r.Sum(a => a.file.ContentLength) });