From a5657c280187e51c512e4e9fe34f0f92fad9d38e Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 24 Oct 2019 09:56:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/discusses_controller.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/controllers/discusses_controller.rb b/app/controllers/discusses_controller.rb
index c0deac091..cbb19cb7f 100644
--- a/app/controllers/discusses_controller.rb
+++ b/app/controllers/discusses_controller.rb
@@ -10,20 +10,17 @@ class DiscussesController < ApplicationController
     @manger = @container.has_manager?(current_user) || current_user.is_certification_teacher
 
     # 总数，分页使用
-    if current_user.admin?
+    if @manger
       @disscuss_count = Discuss.where(:dis_id => @container.id, :dis_type => @container.class.to_s, :root_id => nil).count
       disscusses = Discuss.where(:dis_id => @container.id, :dis_type => @container.class.to_s,
                                              :root_id => nil)
+      @discusses = disscusses.limit(LIMIT).joins("left join games on discusses.challenge_id = games.challenge_id and discusses.user_id = games.user_id")
+                       .select("discusses.*, games.identifier").includes(:user, :praise_treads).offset(offset)
     else
       disscusses = Discuss.where("dis_id = :dis_id and dis_type = :dis_type and root_id is null and
                                       (discusses.hidden = :hidden or discusses.user_id = :user_id)",
                                  {dis_id: @container.id, dis_type: @container.class.to_s, hidden: false, user_id: current_user.id})
       @disscuss_count = disscusses.count("discusses.id")
-    end
-    if @manger
-      @discusses = disscusses.limit(LIMIT).joins("left join games on discusses.challenge_id = games.challenge_id and discusses.user_id = games.user_id")
-                       .select("discusses.*, games.identifier").includes(:user, :praise_treads).offset(offset)
-    else
       @discusses = disscusses.limit(LIMIT).includes(:user, :praise_treads).offset(offset)
     end