issues添加includes

app/controllers/issues_controller.rb

@@ -13,7 +13,7 @@ class IssuesController < ApplicationController
 
   def index
     @user_admin_or_member = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user))
-    issues = @project.issues.issue_issue.includes(:user,:tracker, :priority, :version, :issue_status, :journals, :issue_times)
+    issues = @project.issues.issue_issue
     issues = issues.where(is_private: false) unless @user_admin_or_member
     @all_issues_size = issues.size
     @open_issues_size = issues.where.not(status_id: 5).size

app/controllers/pull_requests_controller.rb

@@ -9,7 +9,7 @@ class PullRequestsController < ApplicationController
 
   def index
     # @issues = Gitea::PullRequest::ListService.new(@user,@repository.try(:identifier)).call   #通过gitea获取
-    issues = @project.issues.issue_pull_request.includes(:user,:tracker, :priority, :version, :issue_status, :journals, :issue_times)
+    issues = @project.issues.issue_pull_request
     issues = issues.where(is_private: false) unless current_user.present? && (current_user.admin? || @project.member?(current_user))
     @all_issues_size = issues.size
     @open_issues_size = issues.where.not(status_id: 5).size

app/models/issue.rb

@@ -22,6 +22,7 @@ class Issue < ApplicationRecord
   scope :issue_many_includes, ->{includes(journals: :user)}
   scope :issue_issue, ->{where(issue_classify: [nil,"issue"])}
   scope :issue_pull_request, ->{where(issue_classify: "pull_request")}
+  scope :issue_index_includes, ->{includes(:user,:tracker, :priority, :version, :issue_status, :journals, :issue_times)}
 
   after_update :change_versions_count
 

app/services/issues/list_query_service.rb

@@ -13,12 +13,12 @@ class Issues::ListQueryService < ApplicationService
     start_time = params[:start_date]
     end_time = params[:due_date]
 
+    issues = all_issues.issue_index_includes
+
     if status_type.to_s == "1"  #表示开启中的
-      issues = all_issues.where.not(status_id: 5)
+      issues = issues.where.not(status_id: 5)
     elsif status_type.to_s == "2"   #表示关闭中的
-      issues = all_issues.where(status_id: 5)
-    else 
-      issues = all_issues
+      issues = issues.where(status_id: 5)
     end
 
     if search_name.present?