|
|
@ -662,8 +662,8 @@ class ShixunsController < ApplicationController
|
|
|
|
school_name = "%#{params[:school_name].to_s.strip}%"
|
|
|
|
school_name = "%#{params[:school_name].to_s.strip}%"
|
|
|
|
if user_name.present? || school_name.present?
|
|
|
|
if user_name.present? || school_name.present?
|
|
|
|
@users = User.joins(user_extension: :school).where("users.id not in #{member_ids} AND users.status = 1 AND
|
|
|
|
@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
|
|
|
|
(LOWER(users.lastname) LIKE ? or users.phone like ?) AND LOWER(schools.name) LIKE
|
|
|
|
'#{school_name}'")
|
|
|
|
?", user_name, user_name, school_name)
|
|
|
|
else
|
|
|
|
else
|
|
|
|
@users = User.none
|
|
|
|
@users = User.none
|
|
|
|
end
|
|
|
|
end
|
|
|
|