From 09b4d7cd667037250358af6f0278a1eadcc67fab Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 10 Aug 2019 10:46:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E6=8E=92=E5=BA=8F=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 8ea6df506..6aaa04f12 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -49,30 +49,12 @@ class CoursesController < ApplicationController
     @user = current_user
     # 根据分类查询课堂(全部，我的，最新，最热)
     @order = params[:order].present? ? params[:order] : "all"
-    order_str = @order != "course_members_count" && @order != "created_at" ? "updated_at" : @order
-
-    # if @order == "all"
-      # @course = Course.where(is_delete: 0, is_hidden: 0).select("select c.name, c.id, s.name, u.login, ifnull(concat(u.lastname,u.firstname),
-      #                        u.login), s.name from courses c, users u, user_extensions ue, schools s where c.is_delete=0 and
-      #                        c.tea_id=u.id and u.id=ue.user_id and ue.school_id=s.id")
-
-      # @courses = Course.where(is_delete: 0, is_hidden: 0)
-      #                .order("courses.id = 1309 desc, courses.created_at desc")
-
-      # @courses = Course.where(is_delete: 0, is_hidden: 0).select("courses.id, courses.tea_id, courses.name, courses.exercises_count, courses.polls_count,
-      #                  courses.is_public, courses.is_end, courses.visits, courses.course_members_count,courses.homework_commons_count,(SELECT MAX(created_at)
-      #                  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a")
-      #                  .order("courses.id = 1309 desc, a desc")
-    if @order == "mine"
-      tip_exception(401, "..") unless current_user.logged?
-      @courses = Course.joins(:course_members)
-                       .where("is_delete = 0 AND is_hidden = 0 AND course_members.user_id = ?", @user.id).distinct
-    elsif @order == "created_at"
-      # REDO:Extension
-      @courses = Course.where(is_delete: 0, is_hidden: 0, is_end: 0).distinct
+    if @order == "visits"
+      order_str = "courses.id = 1309 DESC, courses.visits DESC"
+      @courses = Course.where(is_delete: 0, is_hidden: 0)
     else
-      # REDO:Extension
-      @courses = Course.where(is_delete: 0, is_hidden: 0).distinct
+      order_str = "courses.id = 1309 DESC, courses.homepage_show DESC, courses.created_at desc"
+      @courses = Course.where(is_delete: 0, is_hidden: 0, is_end: 0)
     end
 
     # 根据搜索关键字进一步筛选
@@ -92,7 +74,7 @@ class CoursesController < ApplicationController
                      .where("#{sql}", keyword: "%#{params[:search]}%").distinct
     end
     @courses_count = @courses.count("courses.id")
-    @courses = @courses.order("courses.id = 1309 DESC, courses.#{order_str} DESC")
+    @courses = @courses.order(order_str)
 
     # 分页
     page  = params[:page]  || 1