fix bug

pkg/common/db/model_struct.go

@@ -194,6 +194,10 @@ type ChatLog struct {
 	Ex               string    `gorm:"column:ex;type:varchar(1024)" json:"ex"`
 }
 
+func (ChatLog) TableName() string {
+	return "chat_logs"
+}
+
 type BlackList struct {
 	UserId           string    `gorm:"column:uid"`
 	BeginDisableTime time.Time `gorm:"column:begin_disable_time"`

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

@@ -12,18 +12,55 @@ func GetChatLog(chatLog db.ChatLog, pageNumber, showNumber int32) ([]db.ChatLog,
 		return chatLogs, err
 	}
 	dbConn.LogMode(true)
-	err = dbConn.Table("chat_logs").Where(fmt.Sprintf(" content like '%%%s%%'", chatLog.Content)).
-		Limit(showNumber).Offset(showNumber * (pageNumber - 1)).Find(&chatLogs).Error
+	db := dbConn.Table("chat_logs").
+		Where(fmt.Sprintf(" content like '%%%s%%'", chatLog.Content)).
+		Limit(showNumber).Offset(showNumber * (pageNumber - 1))
+	if chatLog.SessionType != 0 {
+		db = db.Where("session_type = ?", chatLog.SessionType)
+	}
+	if chatLog.ContentType != 0 {
+		db = db.Where("content_type = ?", chatLog.ContentType)
+	}
+	if chatLog.SendID != "" {
+		db = db.Where("send_id = ?", chatLog.SendID)
+	}
+	if chatLog.RecvID != "" {
+		db = db.Where("recv_id = ?", chatLog.RecvID)
+	}
+	if chatLog.SendTime.Unix() > 0 {
+		db = db.Where("send_time > ? and send_time < ?", chatLog.SendTime, chatLog.SendTime.AddDate(0, 0, 1))
+	}
+
+	err = db.Find(&chatLogs).Error
 	return chatLogs, err
 }
 
 func GetChatLogCount(chatLog db.ChatLog) (int64, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	var chatLogs []db.ChatLog
 	var count int64
 	if err != nil {
 		return count, err
 	}
 	dbConn.LogMode(true)
-	err = dbConn.Table("chat_logs").Where(fmt.Sprintf(" content like '%%%s%%' and ", chatLog.Content)).Count(&count).Error
+	db := dbConn.Table("chat_logs").
+		Where(fmt.Sprintf(" content like '%%%s%%'", chatLog.Content))
+	if chatLog.SessionType != 0 {
+		db = db.Where("session_type = ?", chatLog.SessionType)
+	}
+	if chatLog.ContentType != 0 {
+		db = db.Where("content_type = ?", chatLog.ContentType)
+	}
+	if chatLog.SendID != "" {
+		db = db.Where("send_id = ?", chatLog.SendID)
+	}
+	if chatLog.RecvID != "" {
+		db = db.Where("recv_id = ?", chatLog.RecvID)
+	}
+	if chatLog.SendTime.Unix() > 0 {
+		db = db.Where("send_time > ? and send_time < ?", chatLog.SendTime, chatLog.SendTime.AddDate(0, 0, 1))
+	}
+
+	err = db.Find(&chatLogs).Count(&count).Error
 	return count, err
 }

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

@@ -122,7 +122,7 @@ func GetActiveGroups(from, to time.Time, limit int) ([]*activeGroup, error) {
 		group := db.Group{
 			GroupID: activeGroup.Id,
 		}
-		dbConn.Model(&group).Select("group_id", "name").Find(&group)
+		dbConn.Table("groups").Where("group_id= ? ", group.GroupID).Find(&group)
 		activeGroup.Name = group.GroupName
 	}
 	return activeGroups, err