fix bug

pkg/common/db/mysql_model/im_mysql_model/message_cms.go

@@ -47,13 +47,13 @@ func GetChatLogCount(chatLog db.ChatLog) (int64, error) {
 	if chatLog.Content != "" {
 		db = db.Where(" content like ? ", fmt.Sprintf("%%%s%%", chatLog.Content))
 	}
-	if chatLog.SessionType != 0 {
+	if chatLog.SessionType == 1 {
 		db = db.Where("session_type = ?", chatLog.SessionType)
+	} else if chatLog.SessionType == 2 {
+		db = db.Where("content_type in (?)", []int{constant.GroupChatType, constant.SuperGroupChatType})
 	}
-	if chatLog.ContentType == 1 {
+	if chatLog.ContentType != 0 {
 		db = db.Where("content_type = ?", chatLog.ContentType)
-	} else if chatLog.ContentType == 2 {
-		db = db.Where("content_type in (?)", []int{constant.GroupChatType, constant.SuperGroupChatType})
 	}
 	if chatLog.SendID != "" {
 		db = db.Where("send_id = ?", chatLog.SendID)

pkg/common/db/mysql_model/im_mysql_model/statistics_model.go

@@ -97,6 +97,7 @@ func GetActiveUsers(from, to time.Time, limit int) ([]*activeUser, error) {
 			continue
 		}
 		activeUser.Name = user.Nickname
+		activeUser.ID = user.UserID
 	}
 	return activeUsers, err
 }