diff --git a/app/controllers/organizations/organization_users_controller.rb b/app/controllers/organizations/organization_users_controller.rb index 98f2e1656..171e9dcae 100644 --- a/app/controllers/organizations/organization_users_controller.rb +++ b/app/controllers/organizations/organization_users_controller.rb @@ -18,7 +18,8 @@ class Organizations::OrganizationUsersController < Organizations::BaseController organization_user_ids = @organization.organization_users.pluck(:user_id).uniq project_member_user_ids = @organization.projects.joins(:members).pluck("members.user_id").uniq - users = User.where(id: organization_user_ids + project_member_user_ids) + ids = organization_user_ids + project_member_user_ids + users = User.where(id: ids).reorder(Arel.sql("FIELD(users.id,#{ids.join(',')})")) if params[:search].present? search = params[:search].to_s.downcase user_condition_users = User.like(search).to_sql