diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 52e05e57d..234983932 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -627,9 +627,11 @@ class ShixunsController < ApplicationController user_name = "%#{params[:user_name].to_s.strip}%" school_name = "%#{params[:school_name].to_s.strip}%" if user_name.present? || school_name.present? + page = params[:page] || 1 + limit = params[:limit] || 20 @users = User.joins(user_extension: :school).where("users.id not in #{member_ids} AND users.status = 1 AND LOWER(users.lastname) LIKE '#{user_name}' AND LOWER(schools.name) LIKE - '#{school_name}'").limit(20) + '#{school_name}'").page(page).per(limit) else @users = User.none end