diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index ee59dc8b5..51fbfbfda 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -821,15 +821,15 @@ end condition = (params[:research_condition].nil? || params[:research_condition] == "name") ? "concat(lastname, firstname)" : params[:research_condition] if 0 == status if params[:research_condition] == "phone" && params[:research_contents].blank? - @users = User.order("#{@order_key} #{@us_order}").all + @users = User.reorder("#{@order_key} #{@us_order}") else - @users = User.where("#{condition} like '%#{params[:research_contents]}%'").order("#{@order_key} #{@us_order}").all + @users = User.where("#{condition} like '%#{params[:research_contents]}%'").reorder("#{@order_key} #{@us_order}") end else if params[:research_condition] == "phone" && params[:research_contents].blank? - @users = User.where(:status => status).order("#{@order_key} #{@us_order}").all + @users = User.where(:status => status).reorder("#{@order_key} #{@us_order}").all else - @users = User.where("status = #{status} and #{condition} like '%#{params[:research_contents]}%'").order("#{@order_key} #{@us_order}").all + @users = User.where("status = #{status} and #{condition} like '%#{params[:research_contents]}%'").reorder("#{@order_key} #{@us_order}").all end end # if params[:school_id] && params[:school_id] !=''