From 8ca9ced36039e4fa1dd8ed4ec4e8fc84d350c6d0 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Tue, 30 Jan 2024 08:27:49 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E6=95=B0=E5=8F=96=E7=BB=84=E7=BB=87=E5=86=85=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E5=92=8C=E7=BB=84=E7=BB=87=E6=89=80=E6=9C=89=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E7=BB=84=E5=90=88,=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations/organization_users_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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