From 295c1948e2020114279491a82af9a8acffebd37b Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Thu, 29 Jun 2023 13:24:41 +0300 Subject: [PATCH] fixed query --- .../Core/Core/Thirdparty/ThirdPartyTagDao.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/products/ASC.Files/Core/Core/Thirdparty/ThirdPartyTagDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ThirdPartyTagDao.cs index 40540350e0..035a4dad64 100644 --- a/products/ASC.Files/Core/Core/Thirdparty/ThirdPartyTagDao.cs +++ b/products/ASC.Files/Core/Core/Thirdparty/ThirdPartyTagDao.cs @@ -67,7 +67,7 @@ internal class ThirdPartyTagDao : IThirdPartyTagDao { yield break; } - + var qList = await Queries.TagLinkTagPairAsync(filesDbContext, TenantID, entryIds, subject).ToListAsync(); var tags = new List(); @@ -125,10 +125,10 @@ static file class Queries Microsoft.EntityFrameworkCore.EF.CompileAsyncQuery( (FilesDbContext ctx, int tenantId, IEnumerable entryIds, Guid owner) => (from r in ctx.Tag - from l in ctx.TagLink.Where(a => a.TenantId == r.TenantId && a.TagId == r.Id).DefaultIfEmpty() - where r.TenantId == tenantId && l.TenantId == tenantId && r.Type == TagType.New && - entryIds.Contains(l.EntryId) - select new TagLinkTagPair { Tag = r, TagLink = l }) - .Where(r => owner != Guid.Empty && r.Tag.Owner == owner) + from l in ctx.TagLink.Where(a => a.TenantId == r.TenantId && a.TagId == r.Id).DefaultIfEmpty() + where r.TenantId == tenantId && l.TenantId == tenantId && r.Type == TagType.New && + entryIds.Contains(l.EntryId) + select new TagLinkTagPair { Tag = r, TagLink = l }) + .Where(r => owner == Guid.Empty || r.Tag.Owner == owner) .Distinct()); }