|
|
@ -626,9 +626,13 @@ class ShixunsController < ApplicationController
|
|
|
|
member_ids = "(" + @shixun.shixun_members.map(&:user_id).join(',') + ")"
|
|
|
|
member_ids = "(" + @shixun.shixun_members.map(&:user_id).join(',') + ")"
|
|
|
|
user_name = "%#{params[:user_name].strip}%"
|
|
|
|
user_name = "%#{params[:user_name].strip}%"
|
|
|
|
school_name = "%#{params[:school_name].strip}%"
|
|
|
|
school_name = "%#{params[:school_name].strip}%"
|
|
|
|
@users = User.joins(user_extension: :school).where("users.id not in #{member_ids} AND users.status = 1 AND
|
|
|
|
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
|
|
|
|
LOWER(users.lastname) LIKE '#{user_name}' AND LOWER(schools.name) LIKE
|
|
|
|
LOWER(users.lastname) LIKE '#{user_name}' AND LOWER(schools.name) LIKE
|
|
|
|
'#{school_name}' ")
|
|
|
|
'#{school_name}'")
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
@users = User.none
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def shixun_members_added
|
|
|
|
def shixun_members_added
|
|
|
|