From 09da308c99e650d1047ead6dc7181009703cf9c4 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 14 Nov 2019 16:52:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E7=9A=84=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb | 7 ++++++-
 app/views/messages/index.json.jbuilder | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 0e67d9fa0..9f3f71099 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -20,7 +20,12 @@ class MessagesController < ApplicationController
     sort = params[:sort].to_i == 1 ? 'asc' : 'desc'
     sort_type = params[:sort_type] || 'time'
 
-    messages = @board.messages.root_nodes.by_keywords(params[:search])
+    if @board.parent_id == 0
+      messages = Message.where(board_id: @course.boards.pluck(:id))
+    else
+      messages = @board.messages
+    end
+    messages = messages.root_nodes.by_keywords(params[:search])
 
     messages = messages.reorder('(sticky = 1) DESC') # 置顶
 
diff --git a/app/views/messages/index.json.jbuilder b/app/views/messages/index.json.jbuilder
index ae54a1172..4d191cc9d 100644
--- a/app/views/messages/index.json.jbuilder
+++ b/app/views/messages/index.json.jbuilder
@@ -8,7 +8,7 @@ json.data do
     json.array! @messages do |message|
       json.extract! message, :id, :parent_id, :subject, :created_on, :total_replies_count,
                     :praises_count, :visits, :sticky, :is_hidden, :is_public, :board_id
-      json.category_name message.board&.name
+      json.category_name message.board&.name if @board.parent_id == 0 && message.board_id != @board.id
 
       json.total_praises_count @praises_count_map.fetch(message.id, 0)