Merge branch 'main' into next

This commit is contained in:
nocobase[bot] 2025-02-10 00:24:42 +00:00
commit e838c1bb9e

View File

@ -55,6 +55,7 @@ export default function defineMyInAppChannels({ app }: { app: Application }) {
FROM ${messagesTableName} AS messages FROM ${messagesTableName} AS messages
WHERE WHERE
messages.${messagesFieldName.channelName} = ${channelsTableAliasName}.${channelsFieldName.name} messages.${messagesFieldName.channelName} = ${channelsTableAliasName}.${channelsFieldName.name}
AND messages.${messagesFieldName.userId} = ${userId}
ORDER BY messages.${messagesFieldName.receiveTimestamp} DESC ORDER BY messages.${messagesFieldName.receiveTimestamp} DESC
LIMIT 1 LIMIT 1
)`; )`;
@ -118,6 +119,7 @@ export default function defineMyInAppChannels({ app }: { app: Application }) {
FROM ${messagesTableName} AS messages FROM ${messagesTableName} AS messages
WHERE WHERE
messages.${messagesFieldName.channelName} = ${channelsTableAliasName}.${channelsFieldName.name} messages.${messagesFieldName.channelName} = ${channelsTableAliasName}.${channelsFieldName.name}
AND messages.${messagesFieldName.userId} = ${userId}
ORDER BY messages.${messagesFieldName.receiveTimestamp} DESC ORDER BY messages.${messagesFieldName.receiveTimestamp} DESC
LIMIT 1 LIMIT 1
)`), )`),