fix: 历史同步改查 t_message_deletes

命令 12 的会话历史仍 JOIN 已改名的 message_deletes,数据库失败会被收成 50001。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
DESKTOP-L8OUL9F\gfl0034 2026-10-18 19:26:29 +08:00
parent d293de34f5
commit a65d59149c

View File

@ -29,7 +29,7 @@ func (m *Repo) ListByConversation(ctx context.Context, conversationID, viewerID,
if kind == entity.KindGroup { if kind == entity.KindGroup {
var rows []GroupMessage var rows []GroupMessage
err = db.Table(table).Select(table+".*"). err = db.Table(table).Select(table+".*").
Joins("LEFT JOIN message_deletes AS d ON d.msg_id = "+table+".id AND d.user_id = ?", viewerID). Joins("LEFT JOIN t_message_deletes AS d ON d.msg_id = "+table+".id AND d.user_id = ?", viewerID).
Where(table+".conversation_id = ? AND "+table+".id > ? AND "+table+".status <> ? AND d.msg_id IS NULL", conversationID, lastMsgID, entity.StatusHidden). Where(table+".conversation_id = ? AND "+table+".id > ? AND "+table+".status <> ? AND d.msg_id IS NULL", conversationID, lastMsgID, entity.StatusHidden).
Order(table + ".id ASC"). Order(table + ".id ASC").
Limit(limit). Limit(limit).
@ -45,7 +45,7 @@ func (m *Repo) ListByConversation(ctx context.Context, conversationID, viewerID,
} }
var rows []PrivateMessage var rows []PrivateMessage
err = db.Table(table).Select(table+".*"). err = db.Table(table).Select(table+".*").
Joins("LEFT JOIN message_deletes AS d ON d.msg_id = "+table+".id AND d.user_id = ?", viewerID). Joins("LEFT JOIN t_message_deletes AS d ON d.msg_id = "+table+".id AND d.user_id = ?", viewerID).
Where(table+".conversation_id = ? AND "+table+".id > ? AND "+table+".status <> ? AND d.msg_id IS NULL", conversationID, lastMsgID, entity.StatusHidden). Where(table+".conversation_id = ? AND "+table+".id > ? AND "+table+".status <> ? AND d.msg_id IS NULL", conversationID, lastMsgID, entity.StatusHidden).
Order(table + ".id ASC"). Order(table + ".id ASC").
Limit(limit). Limit(limit).