From 024fc97ced94743e8501d26b0f3091f0f0f89d5a Mon Sep 17 00:00:00 2001 From: JustSong Date: Fri, 12 May 2023 12:12:16 +0800 Subject: [PATCH] fix: fix message data is not fully loaded when searching (close #81) --- model/message.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/model/message.go b/model/message.go index a9d84a7..e61630d 100644 --- a/model/message.go +++ b/model/message.go @@ -68,12 +68,16 @@ func GetMessageStatusByLink(link string) (int, error) { } func GetMessagesByUserId(userId int, startIdx int, num int) (messages []*Message, err error) { - err = DB.Where("user_id = ?", userId).Order("id desc").Limit(num).Offset(startIdx).Find(&messages).Error + err = DB.Select([]string{"id", "title", "channel", "timestamp", "status"}). + Where("user_id = ?", userId).Order("id desc").Limit(num).Offset(startIdx).Find(&messages).Error return messages, err } func SearchMessages(keyword string) (messages []*Message, err error) { - err = DB.Select([]string{"id", "title", "description", "content"}).Where("id = ? or title LIKE ? or description LIKE ? or content LIKE ?", keyword, keyword+"%", keyword+"%", keyword+"%").Find(&messages).Error + err = DB.Select([]string{"id", "title", "channel", "timestamp", "status"}). + Where("id = ? or title LIKE ? or description LIKE ? or content LIKE ?", keyword, keyword+"%", keyword+"%", keyword+"%"). + Order("id desc"). + Find(&messages).Error return messages, err }