From cdd2fc3deb5dfa7caae53fa5018d4926f38ca4a5 Mon Sep 17 00:00:00 2001 From: huang Date: Sun, 10 Sep 2017 11:09:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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] !=''