From 6f5515abbccb02a58a12e9664eb2106eb19c4f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A1=A3=E4=B8=8D=E5=A6=82=E6=96=B0?= <root@motype.org>
Date: Mon, 10 Feb 2025 08:24:14 +0800
Subject: [PATCH] fix: add user filter to message timestamp and title
 subqueries (#6185)

---
 .../src/server/defineMyInAppChannels.ts                         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/server/defineMyInAppChannels.ts b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/server/defineMyInAppChannels.ts
index 1a0840c533..d362ebdecc 100644
--- a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/server/defineMyInAppChannels.ts
+++ b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/server/defineMyInAppChannels.ts
@@ -55,6 +55,7 @@ export default function defineMyInAppChannels({ app }: { app: Application }) {
                                 FROM ${messagesTableName} AS messages
                                 WHERE
                                     messages.${messagesFieldName.channelName} = ${channelsTableAliasName}.${channelsFieldName.name}
+                                    AND messages.${messagesFieldName.userId} = ${userId}
                                 ORDER BY messages.${messagesFieldName.receiveTimestamp} DESC
                                 LIMIT 1
                             )`;
@@ -118,6 +119,7 @@ export default function defineMyInAppChannels({ app }: { app: Application }) {
                               FROM ${messagesTableName} AS messages
                               WHERE
                                   messages.${messagesFieldName.channelName} = ${channelsTableAliasName}.${channelsFieldName.name}
+                                  AND messages.${messagesFieldName.userId} = ${userId}
                               ORDER BY messages.${messagesFieldName.receiveTimestamp} DESC
                               LIMIT 1
                   )`),