diff --git a/app/queries/admins/user_query.rb b/app/queries/admins/user_query.rb index dabfa9c5e..6187f2ecc 100644 --- a/app/queries/admins/user_query.rb +++ b/app/queries/admins/user_query.rb @@ -30,6 +30,15 @@ class Admins::UserQuery < ApplicationQuery users = users.joins(user_extension: :school).where(schools: { auto_users_trial: params[:auto_trial].to_i == 1 }) end + # 第三方账户类型 + if params[:open_user_type].present? + if params[:open_user_type] == "Forge" + users = users.left_joins(:open_users).where(open_users: {id: nil}) + else + users = users.joins(:open_users).where(open_users: {type: params[:open_user_type]}) + end + end + # 关键字检索 keyword = params[:keyword].to_s.strip.presence if keyword diff --git a/app/views/admins/users/index.html.erb b/app/views/admins/users/index.html.erb index 42d85108d..4ba38c39a 100644 --- a/app/views/admins/users/index.html.erb +++ b/app/views/admins/users/index.html.erb @@ -15,7 +15,11 @@ <% identity_options = [['全部', ''], ['教师', 0], ['学生', 1], ['专业人士', 2]] %> <%= select_tag(:identity, options_for_select(identity_options), class: 'form-control') %> - +