diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index b1cd27d83..eb2be7082 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -20,7 +20,7 @@ class IssuesController < ApplicationController @close_issues_size = issues.where(status_id: 5).size @assign_to_me_size = issues.where(assigned_to_id: current_user&.id).size @my_published_size = issues.where(author_id: current_user&.id).size - scopes = Issues::ListQueryService.call(issues,params) + scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}) @issues_size = scopes.size @issues = paginate(scopes) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 557661042..ff212c977 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -18,7 +18,7 @@ class PullRequestsController < ApplicationController @my_published_size = issues.where(author_id: current_user&.id).size @user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user)) - scopes = Issues::ListQueryService.call(issues,params) + scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}) @issues_size = scopes.size @issues = paginate(scopes) end diff --git a/app/services/issues/list_query_service.rb b/app/services/issues/list_query_service.rb index 59134ef49..31bad739f 100644 --- a/app/services/issues/list_query_service.rb +++ b/app/services/issues/list_query_service.rb @@ -40,7 +40,7 @@ class Issues::ListQueryService < ApplicationService order_type = params[:order_type] || "desc" #或者"asc" order_name = params[:order_name] || "created_on" #或者"updated_on" - issues.order("issues.#{order_name} #{order_type}") + issues.reorder("issues.#{order_name} #{order_type}") end end \ No newline at end of file