From 895f420902c8a5f4e34590b97474d55704378f25 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 22 Aug 2019 18:30:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/course.rb                 | 1 +
 app/services/users/course_service.rb | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/course.rb b/app/models/course.rb
index b46464ea6..e2fc5140b 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -82,6 +82,7 @@ class Course < ApplicationRecord
   scope :by_keywords, lambda { |keywords|
     where("name LIKE ?", "%#{keywords.split(" ").join('|')}%") unless keywords.blank?
   }
+  scope :started,  -> { where("start_date is null or start_date <= '#{Date.today}'") }
 
   acts_as_taggable
 
diff --git a/app/services/users/course_service.rb b/app/services/users/course_service.rb
index 9eb34917e..de70c5b86 100644
--- a/app/services/users/course_service.rb
+++ b/app/services/users/course_service.rb
@@ -23,11 +23,11 @@ class Users::CourseService
   def category_scope_courses
     case params[:category]
     when 'study' then
-      user.as_student_courses
+      user.as_student_courses.started
     when 'manage' then
       user.manage_courses
     else
-      ids = user.as_student_courses.pluck(:id) + user.manage_courses.pluck(:id)
+      ids = user.as_student_courses.started.pluck(:id) + user.manage_courses.pluck(:id)
       Course.where(id: ids)
     end
   end