From 9fb3966b53f2aa5b56633515baf33ba419586df6 Mon Sep 17 00:00:00 2001
From: Nafu Satsuki <satsuki@nafusoft.dev>
Date: Sat, 28 Oct 2023 22:34:13 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=81=8A=E7=9F=A5=E3=82=89=E3=81=9B?=
 =?UTF-8?q?=E3=81=AE=E6=9C=AA=E8=AA=AD=E9=80=9A=E7=9F=A5=E3=81=8C=E6=B6=88?=
 =?UTF-8?q?=E3=81=88=E3=81=AA=E3=81=84=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/AnnouncementService.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/AnnouncementService.ts b/packages/backend/src/core/AnnouncementService.ts
index 16482a0f90..661a966d69 100644
--- a/packages/backend/src/core/AnnouncementService.ts
+++ b/packages/backend/src/core/AnnouncementService.ts
@@ -51,7 +51,6 @@ export class AnnouncementService {
 			'read."announcementId" = announcement.id AND read."userId" = :userId',
 			{ userId: user.id },
 		);
-		q.andWhere('read.id IS NULL');
 
 		q
 			.where('announcement.isActive = true')
@@ -62,7 +61,8 @@ export class AnnouncementService {
 			.andWhere(new Brackets(qb => {
 				qb.orWhere('announcement.forExistingUsers = false');
 				qb.orWhere('announcement.id > :userId', { userId: user.id });
-			}));
+			}))
+			.andWhere('read.id IS NULL');
 
 		q.orderBy({
 			'announcement."displayOrder"': 'DESC',