From 67b6b735cd23a697ee0ff0aec7cecbcd77272aed Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 27 Jun 2019 15:58:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=AF=84=E8=AE=BA=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/discuss.rb                      | 6 ++++++
 app/views/discusses/_discuss.json.jbuilder | 2 +-
 app/views/discusses/index.json.jbuilder    | 3 +--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/models/discuss.rb b/app/models/discuss.rb
index c1b08718c..8d8dc0163 100644
--- a/app/models/discuss.rb
+++ b/app/models/discuss.rb
@@ -39,6 +39,12 @@ class Discuss < ApplicationRecord
     shixun.has_manager?(user) ? content : ''
   end
 
+  def child_discuss(user)
+    user.admin? ?
+        Discuss.where(parent_id: self.id).includes(:user).reorder(created_at: :asc) :
+        Discuss.where(parent_id: self.id, :hidden => false).includes(:user).reorder(created_at: :asc)
+  end
+
   private
 
   def send_tiding
diff --git a/app/views/discusses/_discuss.json.jbuilder b/app/views/discusses/_discuss.json.jbuilder
index 1fcf150bc..da1ca5a6c 100644
--- a/app/views/discusses/_discuss.json.jbuilder
+++ b/app/views/discusses/_discuss.json.jbuilder
@@ -2,7 +2,7 @@ json.author do
   json.partial! 'users/user', user: discuss.user
 end
 json.id discuss.id
-json.content discuss.contents(container, current_user)
+json.content discuss.contents
 json.time time_from_now(discuss.created_at)
 json.position discuss.position
 json.shixun_id discuss.dis_id
diff --git a/app/views/discusses/index.json.jbuilder b/app/views/discusses/index.json.jbuilder
index 3d0ee9fc9..1b7a95eb3 100644
--- a/app/views/discusses/index.json.jbuilder
+++ b/app/views/discusses/index.json.jbuilder
@@ -2,8 +2,7 @@ json.disscuss_count @disscuss_count
 json.all @current_user.admin?
 json.comments @discusses do |discuss|
   json.partial! 'discusses/discuss', locals: { discuss: discuss, container: @container, current_user: @current_user }
-  child_discuss = Discuss.children(discuss.id)
-  json.children child_discuss do |c_d|
+  json.children discuss.child_discuss(current_user) do |c_d|
     json.partial! 'discusses/discuss', locals: { discuss: c_d, container: @container, current_user: @current_user }
   end
 end