From f5a4fe7e85ddb0b17ba8c3909d9c7c92a8dc3024 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 15 Nov 2019 14:26:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=91=E4=B8=8A=E5=AE=9E=E9=AA=8C?=
 =?UTF-8?q?=E5=AE=A4=E7=9A=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 6fb0bf27c..265e65584 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -61,13 +61,13 @@ class CoursesController < ApplicationController
     @user = current_user
     # 根据分类查询课堂(全部，我的，最新，最热)
     @order = params[:order].present? ? params[:order] : "all"
-    @courses = current_laboratory.courses
+    @courses = current_laboratory.main_site? ? current_laboratory.courses.not_deleted : Course.not_deleted
     if @order == "visits"
       order_str = "courses.id = 1309 DESC, courses.visits DESC"
-      @courses = @courses.where(is_delete: 0, is_hidden: 0)
+      @courses = @courses.where(is_hidden: 0)
     else
       order_str = "courses.id = 1309 DESC, courses.homepage_show DESC, courses.created_at desc"
-      @courses = @courses.where(is_delete: 0, is_hidden: 0, is_end: 0)
+      @courses = @courses.where(is_hidden: 0, is_end: 0)
     end
 
     # 金课未开课的不显示在首页

From c5ff502d78e7d5168cf718d3e92d2a050de2d17f Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 15 Nov 2019 14:27:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=91=E4=B8=8A=E5=AE=9E=E9=AA=8C?=
 =?UTF-8?q?=E5=AE=A4=E7=9A=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 265e65584..6bff6c074 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -61,7 +61,7 @@ class CoursesController < ApplicationController
     @user = current_user
     # 根据分类查询课堂(全部，我的，最新，最热)
     @order = params[:order].present? ? params[:order] : "all"
-    @courses = current_laboratory.main_site? ? current_laboratory.courses.not_deleted : Course.not_deleted
+    @courses = current_laboratory.main_site? ? Course.not_deleted : current_laboratory.courses.not_deleted
     if @order == "visits"
       order_str = "courses.id = 1309 DESC, courses.visits DESC"
       @courses = @courses.where(is_hidden: 0)