fixed 组织成员列表查询优化
This commit is contained in:
parent
6168256897
commit
d04ed7e008
app/controllers/organizations
|
@ -4,12 +4,14 @@ class Organizations::OrganizationUsersController < Organizations::BaseController
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@organization_users = @organization.organization_users.includes(:user)
|
@organization_users = @organization.organization_users.includes(:user)
|
||||||
search = params[:search].to_s.downcase
|
if params[:search].present?
|
||||||
user_condition_users = User.like(search).to_sql
|
search = params[:search].to_s.downcase
|
||||||
team_condition_teams = User.joins(:teams).merge(@organization.teams.like(search)).to_sql
|
user_condition_users = User.like(search).to_sql
|
||||||
users = User.from("( #{user_condition_users} UNION #{team_condition_teams }) AS users")
|
team_condition_teams = User.joins(:teams).merge(@organization.teams.like(search)).to_sql
|
||||||
|
users = User.from("( #{user_condition_users} UNION #{team_condition_teams }) AS users")
|
||||||
@organization_users = @organization_users.where(user_id: users).distinct
|
|
||||||
|
@organization_users = @organization_users.where(user_id: users).distinct
|
||||||
|
end
|
||||||
|
|
||||||
@organization_users = kaminari_paginate(@organization_users)
|
@organization_users = kaminari_paginate(@organization_users)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue