diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index d54125726..154d94097 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -21,11 +21,8 @@ class IssuesController < ApplicationController
     @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)
-
-    @page = params[:page]
-    @limit = params[:limit] || 15
     @issues_size = scopes.size
-    @issues = scopes.page(@page).per(@limit)
+    @issues = paginate(scopes)
 
     respond_to do |format|
       format.json
diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 75abc437e..691552576 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -19,11 +19,8 @@ class PullRequestsController < ApplicationController
     @user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
 
     scopes = Issues::ListQueryService.call(issues,params)
-
-    @page = params[:page]
-    @limit = params[:limit] || 15
     @issues_size = scopes.size
-    @issues = scopes.page(@page).per(@limit)
+    @issues = paginate(scopes)
   end
 
   def new
diff --git a/app/services/issues/list_query_service.rb b/app/services/issues/list_query_service.rb
index e39b166b9..46af67377 100644
--- a/app/services/issues/list_query_service.rb
+++ b/app/services/issues/list_query_service.rb
@@ -41,7 +41,7 @@ class Issues::ListQueryService < ApplicationService
 
     order_type = params[:order_type] || "desc"   #或者"asc"
     order_name = params[:order_name] || "created_on"   #或者"updated_on"
-    issues.order("#{order_name} #{order_type}")
+    issues.reorder("#{order_name} #{order_type}")
 
   end