Commit 09d5897e authored by chenweijian's avatar chenweijian

家族小助手

parent 916acd72
...@@ -66,9 +66,9 @@ func BatchGetMedals(db *gorm.DB, groupIds []string) (map[string][]uint64, error) ...@@ -66,9 +66,9 @@ func BatchGetMedals(db *gorm.DB, groupIds []string) (map[string][]uint64, error)
return nil, nil return nil, nil
} }
rows := make([]GroupMedal, 0) rows := make([]GroupMedal, 0)
if err := db.Table("group_medal gm").Joins("left join res_medal rm on rm.id = gm.res_medal_id"). if err := db.Model(GroupMedal{}).Joins("left join res_medal rm on group_medal.res_medal_id = rm.id").
Where("gm.im_group_id IN ?", groupIds). Where("group_medal.im_group_id IN ?", groupIds).
Where("(gm.expire_at is null or gm.expire_at > ?)", time.Now().Format(utils.DATETIME_FORMAT)). Where("(group_medal.expire_at is null or group_medal.expire_at > ?)", time.Now().Format(utils.DATETIME_FORMAT)).
Order("rm.sort"). Order("rm.sort").
Find(&rows).Error; err != nil { Find(&rows).Error; err != nil {
return nil, err return nil, err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment