Browse Source

fixed 组织成员数取组织内成员和组织所有仓库成员组合,排序加入时间

pull/347/head
xxq250 2 years ago
parent
commit
8ca9ced360
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      app/controllers/organizations/organization_users_controller.rb

+ 2
- 1
app/controllers/organizations/organization_users_controller.rb View File

@@ -18,7 +18,8 @@ class Organizations::OrganizationUsersController < Organizations::BaseController


organization_user_ids = @organization.organization_users.pluck(:user_id).uniq organization_user_ids = @organization.organization_users.pluck(:user_id).uniq
project_member_user_ids = @organization.projects.joins(:members).pluck("members.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? if params[:search].present?
search = params[:search].to_s.downcase search = params[:search].to_s.downcase
user_condition_users = User.like(search).to_sql user_condition_users = User.like(search).to_sql


Loading…
Cancel
Save