diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index d434651cf..400fad766 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -9,19 +9,21 @@ class ManagementsController < ApplicationController # 0 全部;1 活动的; 2 已注册; 3 锁定 def users - status = params[:user_status].nil? ? 0 : params[:user_status].to_i + status = params[:user_status].nil? ? 0 : params[:user_status].to_i + @us_order = params[:us_order].blank? ? "desc" : params[:us_order] # 排序 + @order_key = params[:order_key].blank? ? "created_on" : params[:order_key] # 排序关键字 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("created_on desc").all + @users = User.order("#{@order_key} #{@us_order}").all else - @users = User.where("#{condition} like '%#{params[:research_contents]}%'").order("created_on desc").all + @users = User.where("#{condition} like '%#{params[:research_contents]}%'").order("#{@order_key} #{@us_order}").all end else if params[:research_condition] == "phone" && params[:research_contents].blank? - @users = User.where(:status => status).order("created_on desc").all + @users = User.where(:status => status).order("#{@order_key} #{@us_order}").all else - @users = User.where("status = #{status} and #{condition} like '%#{params[:research_contents]}%'").order("created_on desc").all + @users = User.where("status = #{status} and #{condition} like '%#{params[:research_contents]}%'").order("#{@order_key} #{@us_order}").all end end @@ -33,8 +35,8 @@ class ManagementsController < ApplicationController @users = paginateHelper @users, @limit respond_to do |format| - format.html format.js + format.html end end diff --git a/app/views/managements/_user_list.html.erb b/app/views/managements/_user_list.html.erb index 441dc6170..398c5f486 100644 --- a/app/views/managements/_user_list.html.erb +++ b/app/views/managements/_user_list.html.erb @@ -6,8 +6,8 @@ 邮件地址 手机号码 单位 - 创建于 - 最后登录 + 创建于 ml5 color-blue"> + 最后登录 ml5 color-blue"> 操作 @@ -44,4 +44,43 @@
-<% end %> \ No newline at end of file +<% end %> + \ No newline at end of file