From f63df877dbe46cdc1a70413d66e84ffa5b6a4cf6 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 13 Jul 2016 08:44:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=9C=AA=E5=91=BD=E5=90=8D=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/syllabuses_service.rb | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/services/syllabuses_service.rb b/app/services/syllabuses_service.rb
index 55e0768d7..885dea975 100644
--- a/app/services/syllabuses_service.rb
+++ b/app/services/syllabuses_service.rb
@@ -29,19 +29,13 @@ class SyllabusesService
   end
   #获取指定用户的课程大纲
   def user_syllabus(user)
-    courses = CoursesService.new.user_courses_list(user)
-
-    other = Syllabus.new(title: '未命名课程',user_id: user.id)
-
-    courses.each do |c|
-      other.courses << c[:course] unless c[:course].syllabus
-    end
-    
-    # user.syllabuses.each do |syllabus|
-    #   syllabus.courses = syllabus.courses.not_deleted
-    # end
+    # courses = CoursesService.new.user_courses_list(user)
+    #
+    # other = Syllabus.new(title: '未命名课程',user_id: user.id)
     #
-    # user.syllabuses.to_a << other
+    # courses.each do |c|
+    #   other.courses << c[:course] unless c[:course].syllabus
+    # end
 
     courses = user.courses.not_deleted
     syllabus_ids = courses.empty? ? '(-1)' : "(" + courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")"
@@ -51,8 +45,9 @@ class SyllabusesService
       syllabus.courses = courses.where("syllabus_id = #{syllabus.id}").select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("time desc")
     end
 
-    syllabuses.to_a << other
+    # syllabuses.to_a << other
 
+    syllabuses.to_a
     #管理权限 can_setting
     syllabuses.each do |s|
       s = judge_can_setting(s,user)