forked from Trustie/forgeplus
fixed: order不对等
This commit is contained in:
parent
d58b9d5885
commit
fed4242bb3
|
|
@ -15,7 +15,7 @@ class CompetitionInfosController < ApplicationController
|
|||
competition_infos = CompetitionInfo.order(sort_no: :desc)
|
||||
competition_infos = competition_infos.where("competition_infos.title like ?", "%#{params[:name]}%") if params[:name].present?
|
||||
competition_infos = competition_infos.joins(:watchers).where(watchers: { user_id: current_user.id }) if params[:category].to_s == "watched"
|
||||
competition_infos = competition_infos.joins(:competition_users).where(competition_users: { user_id: current_user.id }).or(CompetitionInfo.joins(:competition_users).merge(CompetitionUser.with_member_phone(current_user.phone))) if params[:category].to_s == "joined"
|
||||
competition_infos = competition_infos.joins(:competition_users).where(competition_users: { user_id: current_user.id }).or(competition_infos.joins(:competition_users).merge(CompetitionUser.with_member_phone(current_user.phone))) if params[:category].to_s == "joined"
|
||||
competition_infos = competition_infos.where(status: ActiveModel::Type::Boolean.new.cast(params[:status])) if ActiveModel::Type::Boolean.new.cast(params[:status]).present?
|
||||
if params[:is_expert_audit].present?
|
||||
competition_infos = competition_infos.where(:is_expert_audit => params[:is_expert_audit].to_s == "true")
|
||||
|
|
|
|||
Loading…
Reference in New Issue