Browse Source

修复:issue子评论关联查询错误

pull/343/head
yystopf xxq250 2 years ago
parent
commit
9ee2c8dde3
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      app/models/journal.rb
  2. +1
    -1
      app/services/api/v1/issues/journals/list_service.rb

+ 1
- 1
app/models/journal.rb View File

@@ -44,7 +44,7 @@ class Journal < ApplicationRecord
belongs_to :reply_journal, class_name: 'Journal', foreign_key: :reply_id, optional: true
has_many :journal_details, :dependent => :delete_all
has_many :attachments, as: :container, dependent: :destroy
has_many :first_ten_children_journals, -> { order(created_on: :asc).limit(10)}, class_name: 'Journal', foreign_key: :parent_id
has_many :first_ten_children_journals, -> { order(created_on: :asc).limit(20)}, class_name: 'Journal', foreign_key: :parent_id
has_many :children_journals, class_name: 'Journal', foreign_key: :parent_id, dependent: :destroy

scope :journal_includes, ->{includes(:user, :journal_details, :attachments)}


+ 1
- 1
app/services/api/v1/issues/journals/list_service.rb View File

@@ -48,7 +48,7 @@ class Api::V1::Issues::Journals::ListService < ApplicationService
@queried_journals = @queried_journals.where(notes: nil)
end

@queried_journals = @queried_journals.includes(:journal_details, :user, :attachments, first_ten_children_journals: [:parent_journal, :reply_journal])
@queried_journals = @queried_journals.includes(:journal_details, :user, :attachments, :children_journals)
@queried_journals = @queried_journals.reorder("journals.#{sort_by} #{sort_direction}").distinct

@queried_journals


Loading…
Cancel
Save