article

src/Hotline.Api/Controllers/ArticleController.cs

@@ -15,6 +15,8 @@ using Hotline.Users;
 using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.OpenApi.Writers;
+using MongoDB.Driver.Linq;
+using SqlSugar;
 using XF.Domain.Authentications;
 using XF.Domain.Exceptions;
 using XF.Domain.Repository;
@@ -83,8 +85,10 @@ namespace Hotline.Api.Controllers
                 .WhereIF(dto.CircularTimeStart.HasValue, d => d.CircularTime >= dto.CircularTimeStart)
                 .WhereIF(dto.CircularTimeEnd.HasValue, d => d.CircularTime <= dto.CircularTimeEnd)
                 .WhereIF(dto.CircularState != null, d => d.CircularState == dto.CircularState)
-                .WhereIF(dto.IsRead!=null, d=>d.CircularReadGroups.Any(x=>x.IsRead == dto.IsRead))
-                .Where(d=>d.CircularReadGroups.Any(x=> x.UserId == _sessionContext.RequiredUserId) || d.CircularReadGroups.Any(x=>x.OrgId == _sessionContext.RequiredOrgId))
+                //.WhereIF(dto.IsRead!=null,d=>d.CircularReadGroups.Any(x=>x.IsRead == dto.IsRead) && (d.CircularReadGroups.Any(x => x.UserId == _sessionContext.RequiredUserId) || d.CircularReadGroups.Any(x => x.OrgId == _sessionContext.RequiredOrgId)))
+                .WhereIF(dto.IsRead != null,d=> (d.CircularReadGroups.Any(x=>x.IsRead == dto.IsRead && x.UserId == _sessionContext.UserId)) ||
+                (d.CircularReadGroups.Any(x=>x.IsRead == dto.IsRead && x.OrgId == _sessionContext.OrgId)))
+                //.Where(d=>d.CircularReadGroups.Any(x=> x.UserId == _sessionContext.RequiredUserId) || d.CircularReadGroups.Any(x=>x.OrgId == _sessionContext.RequiredOrgId))
                 .OrderByDescending(d => d.CreationTime)
                 .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
             return new PagedDto<CircularDto>(total, _mapper.Map<IReadOnlyList<CircularDto>>(items));