diff --git a/internal/api/manage/management_chat.go b/internal/api/manage/management_chat.go index 5a7a91b25..b65294379 100644 --- a/internal/api/manage/management_chat.go +++ b/internal/api/manage/management_chat.go @@ -336,6 +336,10 @@ func ManagementBatchSendMsg(c *gin.Context) { var recvList []string if params.IsSendAll { recvList, err = im_mysql_model.SelectAllUserID() + if err != nil { + log.NewError(params.OperationID, utils.GetSelfFuncName(), err.Error()) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) + } } else { recvList = params.RecvIDList } diff --git a/pkg/common/db/rocks_cache/rocks_cache.go b/pkg/common/db/rocks_cache/rocks_cache.go index 103bd51f7..fa81bd86a 100644 --- a/pkg/common/db/rocks_cache/rocks_cache.go +++ b/pkg/common/db/rocks_cache/rocks_cache.go @@ -460,16 +460,16 @@ func GetConversationFromCache(ownerUserID, conversationID string) (*db.Conversat getConversation := func() (string, error) { conversation, err := imdb.GetConversation(ownerUserID, conversationID) if err != nil { - return "", utils.Wrap(err, "") + return "", utils.Wrap(err, "get failed") } bytes, err := json.Marshal(conversation) - return string(bytes), utils.Wrap(err, "") + return string(bytes), utils.Wrap(err, "Marshal failed") } conversationStr, err := db.DB.Rc.Fetch(conversationCache+ownerUserID+":"+conversationID, time.Second*30*60, getConversation) conversation := db.Conversation{} err = json.Unmarshal([]byte(conversationStr), &conversation) if err != nil { - return nil, err + return nil, utils.Wrap(err, "Unmarshal failed") } return &conversation, nil }