msumshk/TakeoutSaaS.AdminApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复公告过时警告并补齐用户权限

Browse Source
This commit is contained in:
MSuMshk
2025-12-27 07:19:27 +08:00
parent caad541e2f
commit 04444c6554
16 changed files with 879 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Infrastructure/TakeoutSaaS.Infrastructure/App/Repositories/EfTenantAnnouncementRepository.cs
View File

@@ -50,7 +50,9 @@ public sealed class EfTenantAnnouncementRepository(TakeoutAppDbContext context)
if (isActive.HasValue)
{
query = query.Where(x => x.IsActive == isActive.Value);
query = isActive.Value
? query.Where(x => x.Status == AnnouncementStatus.Published)
: query.Where(x => x.Status != AnnouncementStatus.Published);
}
if (effectiveFrom.HasValue)
@@ -114,7 +116,9 @@ public sealed class EfTenantAnnouncementRepository(TakeoutAppDbContext context)
if (isActive.HasValue)
{
announcementQuery = announcementQuery.Where(x => x.IsActive == isActive.Value);
announcementQuery = isActive.Value
? announcementQuery.Where(x => x.Status == AnnouncementStatus.Published)
: announcementQuery.Where(x => x.Status != AnnouncementStatus.Published);
}
if (effectiveAt.HasValue)