@ -5,6 +5,6 @@ class ShixunListsController < ApplicationController
private
def search_params
params.permit(:keyword, :type, :page, :per_page, :order, :type, :status, :diff)
params.permit(:keyword, :type, :page, :limit, :order, :type, :status, :diff)
end
@ -42,7 +42,7 @@ class ShixunSearchService < ApplicationService
def search_options
model_options = {
includes: Shixun.searchable_includes
includes: [ :shixun_info, :challenges, :subjects, user: { user_extension: :school } ]
}
model_options.merge!(where: { id: @shixuns.pluck(:id) })
model_options.merge!(order: {"myshixuns_count" => sort_str})