Merge branch 'main' into next

ldq1220 · Dec 23, 2024 · 4f3ca77 · 4f3ca77
2 parents 0a37705 + 4b694ee
commit 4f3ca77
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/packages/plugins/@nocobase/plugin-action-template-print b/packages/plugins/@nocobase/plugin-action-template-print
diff --git a/.../plugins/@nocobase/plugin-notification-in-app-message/src/server/defineMyInAppChannels.ts b/.../plugins/@nocobase/plugin-notification-in-app-message/src/server/defineMyInAppChannels.ts
@@ -73,6 +73,7 @@ export default function defineMyInAppChannels({ app }: { app: Application }) {
               SELECT  messages.${messagesFieldName.channelName}
               FROM ${messagesTableName} AS messages
               WHERE messages.${messagesFieldName.status} = '${status}'
+              AND messages.${messagesFieldName.userId} = ${userId}
           )`);
             return { name: { [Op.in]: sql } };
           };