From 4efa98153fe89cf82c46cde024a0d83585c01490 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 28 Jun 2019 15:09:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=88=E4=BD=9C=E8=80=85?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/shixuns_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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