From a14b0b2eb17111c366c46d4865c11535823c2a46 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 8 May 2020 15:29:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9issues=E7=9A=84=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 2 +- app/controllers/pull_requests_controller.rb | 2 +- app/services/issues/list_query_service.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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