diff --git a/app/controllers/api/v1/resident_experts_controller.rb b/app/controllers/api/v1/resident_experts_controller.rb index 373344760..b45dddd83 100644 --- a/app/controllers/api/v1/resident_experts_controller.rb +++ b/app/controllers/api/v1/resident_experts_controller.rb @@ -2,8 +2,9 @@ class Api::V1::ResidentExpertsController < Api::V1::BaseController before_action :require_login, except: [:index] def index + @resident_experts = ResidentExpert.approved.includes(:user) all_resident_experts = ResidentExpert.approved.includes(:user) - @resident_experts = all_resident_experts.where(expert_category: params[:expert_category]) if params[:expert_category].present? + @resident_experts = @resident_experts.where(expert_category: params[:expert_category]) if params[:expert_category].present? @resident_experts = @resident_experts.where("name like ? or department like ?", "%#{params[:keyword]}%", "%#{params[:keyword]}%") if params[:keyword].present? @resident_expert_category_list = all_resident_experts.group(:expert_category).count @resident_expert_memos_rank_list = all_resident_experts.order("users.memos_count desc").limit(5)