From c65475b199781b5a948cbfb200853d1c2047087d Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 20 Jul 2019 23:47:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E7=94=A8=E5=AE=9E=E8=B7=B5=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_commons_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index 8e4b888a1..052db3e4f 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -949,7 +949,7 @@ class HomeworkCommonsController < ApplicationController
 
     # 最热排序
     if reorder == "myshixun_count"
-      if select
+      if select && select != "all"
         @subjects = Subject.find_by_sql("SELECT subjects.id, subjects.user_id, subjects.name, subjects.stages_count, subjects.repertoire_id, subjects.status,
                             subjects.shixuns_count, sum(shixuns.myshixuns_count) AS myshixun_member_count FROM subjects join stage_shixuns
                             on stage_shixuns.subject_id = subjects.id join shixuns on shixuns.id = stage_shixuns.shixun_id where
@@ -973,7 +973,7 @@ class HomeworkCommonsController < ApplicationController
       end
 
       # 类型
-      if select
+      if select && select != "all"
         @subjects = @subjects.where(repertoire_id: select)
       end