diff --git a/controllers/client/tug_war.go b/controllers/client/tug_war.go index 77a7cbb..4c1ba07 100644 --- a/controllers/client/tug_war.go +++ b/controllers/client/tug_war.go @@ -90,8 +90,7 @@ func (t *TugOfWarCtl) Shake() { } // 根据team_id 获取所有成员的分数 - members := make([]*models.BaheTeamMember, 0) - err = models.GetBaheMembersByTeamId(members, member.TeamId, member.RehearsalId) + members, err := models.GetBaheMembersByTeamId(member.TeamId, member.RehearsalId) t.CheckErr(err) var rank int diff --git a/models/bahe_team_member.go b/models/bahe_team_member.go index 3f6931e..d9794ff 100644 --- a/models/bahe_team_member.go +++ b/models/bahe_team_member.go @@ -42,7 +42,8 @@ func (t *BaheTeamMember) IncrScoreById(id, score int64) (int64, error) { return core.GetXormAuto().ID(id).Incr("score", score).Cols("score, sort_time").Update(t) } -func GetBaheMembersByTeamId(obj, teamId, rehearsalId interface{}) error { - return core.GetXormAuto().Where("is_delete=0 and team_id=? and rehearsal_id=?", - teamId, rehearsalId).Desc("score").Asc("sort_time").Find(&obj) +func GetBaheMembersByTeamId(teamId, rehearsalId interface{}) (members []*BaheTeamMember, err error) { + err = core.GetXormAuto().Where("is_delete=0 and team_id=? and rehearsal_id=?", + teamId, rehearsalId).Desc("score").Asc("sort_time").Find(&members) + return }