diff --git a/domain/model/group_m/groupMedal.go b/domain/model/group_m/groupMedal.go index 14799278d363d5a9c53479640872605e6e8ad304..78798ec7ec851a19ebabc5a33602b1ddab0d8514 100644 --- a/domain/model/group_m/groupMedal.go +++ b/domain/model/group_m/groupMedal.go @@ -66,9 +66,9 @@ func BatchGetMedals(db *gorm.DB, groupIds []string) (map[string][]uint64, error) return nil, nil } rows := make([]GroupMedal, 0) - if err := db.Table("group_medal gm").Joins("left join res_medal rm on rm.id = gm.res_medal_id"). - Where("gm.im_group_id IN ?", groupIds). - Where("(gm.expire_at is null or gm.expire_at > ?)", time.Now().Format(utils.DATETIME_FORMAT)). + if err := db.Model(GroupMedal{}).Joins("left join res_medal rm on group_medal.res_medal_id = rm.id"). + Where("group_medal.im_group_id IN ?", groupIds). + Where("(group_medal.expire_at is null or group_medal.expire_at > ?)", time.Now().Format(utils.DATETIME_FORMAT)). Order("rm.sort"). Find(&rows).Error; err != nil { return nil, err