mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-07-01 10:42:19 +08:00
Merge branch 'next' into develop
This commit is contained in:
commit
3b48f1e646
@ -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
|
||||||
)`),
|
)`),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user