|
|
@ -53,7 +53,7 @@ class Admins::ShixunSettingsQuery < ApplicationQuery
|
|
|
|
all_shixuns = all_shixuns.where(vip: params[:vip]) if params[:vip]
|
|
|
|
all_shixuns = all_shixuns.where(vip: params[:vip]) if params[:vip]
|
|
|
|
if params[:no_subject]
|
|
|
|
if params[:no_subject]
|
|
|
|
shixun_ids = StageShixun.pluck(:shixun_id).uniq
|
|
|
|
shixun_ids = StageShixun.pluck(:shixun_id).uniq
|
|
|
|
all_shixuns = all_shixuns.where.not(id: shixun_ids)
|
|
|
|
all_shixuns = all_shixuns.published.where.not(id: shixun_ids)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
custom_sort(all_shixuns, params[:sort_by], params[:sort_direction])
|
|
|
|
custom_sort(all_shixuns, params[:sort_by], params[:sort_direction])
|
|
|
|