Browse Source

fixed 组织成员列表查询优化

pull/313/head
“xxq250” 3 years ago
parent
commit
8f4cb2667f
1 changed files with 8 additions and 6 deletions
  1. +8
    -6
      app/controllers/organizations/organization_users_controller.rb

+ 8
- 6
app/controllers/organizations/organization_users_controller.rb View File

@@ -4,12 +4,14 @@ class Organizations::OrganizationUsersController < Organizations::BaseController

def index
@organization_users = @organization.organization_users.includes(:user)
search = params[:search].to_s.downcase
user_condition_users = User.like(search).to_sql
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
if params[:search].present?
search = params[:search].to_s.downcase
user_condition_users = User.like(search).to_sql
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
end

@organization_users = kaminari_paginate(@organization_users)
end


Loading…
Cancel
Save