chore: 优化公告已读批量与用户维度

src/Application/TakeoutSaaS.Application/App/Tenants/Handlers/GetTenantAnnouncementQueryHandler.cs

@@ -2,6 +2,7 @@ using MediatR;
 using TakeoutSaaS.Application.App.Tenants.Dto;
 using TakeoutSaaS.Application.App.Tenants.Queries;
 using TakeoutSaaS.Domain.Tenants.Repositories;
+using TakeoutSaaS.Shared.Abstractions.Security;
 
 namespace TakeoutSaaS.Application.App.Tenants.Handlers;
 
@@ -10,7 +11,8 @@ namespace TakeoutSaaS.Application.App.Tenants.Handlers;
 /// </summary>
 public sealed class GetTenantAnnouncementQueryHandler(
     ITenantAnnouncementRepository announcementRepository,
-    ITenantAnnouncementReadRepository readRepository)
+    ITenantAnnouncementReadRepository readRepository,
+    ICurrentUserAccessor? currentUserAccessor = null)
     : IRequestHandler<GetTenantAnnouncementQuery, TenantAnnouncementDto?>
 {
     public async Task<TenantAnnouncementDto?> Handle(GetTenantAnnouncementQuery request, CancellationToken cancellationToken)
@@ -21,7 +23,20 @@ public sealed class GetTenantAnnouncementQueryHandler(
             return null;
         }
 
-        var reads = await readRepository.GetByAnnouncementAsync(request.TenantId, request.AnnouncementId, cancellationToken);
+        var userId = currentUserAccessor?.UserId ?? 0;
+        var reads = await readRepository.GetByAnnouncementAsync(
+            request.TenantId,
+            new[] { request.AnnouncementId },
+            userId == 0 ? null : userId,
+            cancellationToken);
+
+        // 如无用户级已读，再查租户级已读
+        if (reads.Count == 0)
+        {
+            var tenantReads = await readRepository.GetByAnnouncementAsync(request.TenantId, new[] { request.AnnouncementId }, null, cancellationToken);
+            reads = tenantReads;
+        }
+
         var readRecord = reads.FirstOrDefault();
         return announcement.ToDto(readRecord != null, readRecord?.ReadAt);
     }