diff --git a/internal/tools/msg_doc_convert.go b/internal/tools/msg_doc_convert.go index 6793301fd..537b7bf2c 100644 --- a/internal/tools/msg_doc_convert.go +++ b/internal/tools/msg_doc_convert.go @@ -14,9 +14,9 @@ func (c *MsgTool) ConvertTools() { log.ZError(ctx, "get all conversation ids failed", err) return } - // for _, conversationID := range conversationIDs { - // conversationIDs = append(conversationIDs, msgprocessor.GetNotificationConversationIDByConversationID(conversationID)) - // } + for _, conversationID := range conversationIDs { + conversationIDs = append(conversationIDs, msgprocessor.GetNotificationConversationIDByConversationID(conversationID)) + } userIDs, err := c.userDatabase.GetAllUserID(ctx, 0, 0) if err != nil { log.ZError(ctx, "get all user ids failed", err) @@ -27,6 +27,6 @@ func (c *MsgTool) ConvertTools() { conversationIDs = append(conversationIDs, msgprocessor.GetConversationIDBySessionType(constant.SingleChatType, userID, userID)) conversationIDs = append(conversationIDs, msgprocessor.GetNotificationConversationID(constant.SingleChatType, userID, userID)) } - log.ZDebug(ctx, "all userIDs", "len userIDs", len(conversationIDs)) + log.ZDebug(ctx, "all conversationIDs", "len userIDs", len(conversationIDs)) c.msgDatabase.ConvertMsgsDocLen(ctx, conversationIDs) } diff --git a/pkg/common/db/relation/user_model.go b/pkg/common/db/relation/user_model.go index a3a4579ac..2c6710a63 100644 --- a/pkg/common/db/relation/user_model.go +++ b/pkg/common/db/relation/user_model.go @@ -85,7 +85,7 @@ func (u *UserGorm) Page( // 获取所有用户ID. func (u *UserGorm) GetAllUserID(ctx context.Context, pageNumber, showNumber int32) (userIDs []string, err error) { - if pageNumber != 0 || showNumber != 0 { + if pageNumber == 0 || showNumber == 0 { return userIDs, errs.Wrap(u.db(ctx).Pluck("user_id", &userIDs).Error) } else { return userIDs, errs.Wrap(u.db(ctx).Limit(int(showNumber)).Offset(int((pageNumber-1)*showNumber)).Pluck("user_id", &userIDs).Error)