Skip to content

Commit

Permalink
analizators/2178
Browse files Browse the repository at this point in the history
  • Loading branch information
SuhorukovAnton committed Jan 19, 2022
1 parent e046f6f commit 547b78b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion common/services/ASC.AuditTrail/AuditEventsRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ orderby q.Date descending

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)
Expand Down
2 changes: 1 addition & 1 deletion common/services/ASC.AuditTrail/LoginEventsRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public int GetCount(int tenant, DateTime? from = null, DateTime? to = null)

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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public override List<UsageSpaceStatItem> GetStatData()
.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) });

Expand Down

0 comments on commit 547b78b

Please sign in to comment.