forked from Gitlink/forgeplus
fixed 排行榜调整查询
This commit is contained in:
parent
684feea8c7
commit
24b03d1713
|
@ -627,16 +627,17 @@ class CompetitionInfosController < ApplicationController
|
|||
@stage = 1
|
||||
end
|
||||
if @stage.present?
|
||||
competition_users = @competition_info.competition_users.select("distinct competition_users.*").joins(:competition_user_scores)
|
||||
competition_users = @competition_info.competition_users
|
||||
if params[:keyword].present?
|
||||
competition_users = competition_users.where("competition_users.org_name LIKE :keyword OR competition_users.leader LIKE :keyword OR competition_users.ext4 LIKE :keyword ", keyword: "%#{params[:keyword].to_s}%")
|
||||
end
|
||||
@competition_users_count = competition_users.count
|
||||
competition_users = competition_users.select("distinct competition_users.*").joins(:competition_user_scores)
|
||||
.where("competition_users.status = 3")
|
||||
.where("competition_user_scores.stage = ? ", @stage.to_i)
|
||||
.where("competition_user_scores.score > 0")
|
||||
.order("competition_user_scores.score desc, competition_user_scores.created_at asc")
|
||||
@rank_num = competition_users.pluck(:id)
|
||||
if params[:keyword].present?
|
||||
competition_users = competition_users.where("competition_users.org_name LIKE :keyword OR competition_users.leader LIKE :keyword OR competition_users.ext4 LIKE :keyword ", keyword: "%#{params[:keyword].to_s}%")
|
||||
end
|
||||
@competition_users_count = competition_users.count
|
||||
@competition_users = paginate(competition_users)
|
||||
else
|
||||
competition_users = @competition_info.competition_users.where("competition_users.status = 3").where("score > 0").order("score desc, created_at asc")
|
||||
|
|
Loading…
Reference in New Issue