diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 9eef2c48f..c4eaeee70 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -50,17 +50,18 @@ class CoursesController < ApplicationController
     @syllabuses_num  = Course.all.count
     #@syllabus_count = all_syllabuses.count
     # 我创建的课堂
-    create_syllabuses = Course.where(:tea_id => @user.id)
+    #create_syllabuses = Course.where(:tea_id => @user.id)
     # 我参与的课堂
-    join_syllabuses = @user.courses.where("is_delete = 0 and tea_id != #{@user.id}")
-    @join_syllabuses_count = join_syllabuses.where(:is_end => 0, :is_delete => 0).count
-    @create_syllabuses_count = create_syllabuses.where(:is_end => 0, :is_delete => 0).count
+    #join_syllabuses = @user.courses.where("is_delete = 0 and tea_id != #{@user.id}")
+    # @join_syllabuses_count = @user.courses.not_deleted_not_end.order("updated_at desc").select{ |course| !@user.has_teacher_role(course)}.count
+    # @create_syllabuses_count = @user.courses.not_deleted_not_end.order("updated_at desc").select{ |course| @user.has_teacher_role(course)}.count
+    @my_courses_count = @user.courses.not_deleted_not_end.count
 
     # 页面筛选的课程
     if @select == "create"
-      @syllabuses = create_syllabuses.where("is_end = 0 and is_delete = 0 and name like '%#{@search}%'")
+      @syllabuses = @user.courses.not_deleted_not_end.where("name like '%#{@search}%'").order("updated_at desc").select{ |course| @user.has_teacher_role(course)}
     elsif @select == "join"
-      @syllabuses = join_syllabuses.where("is_end = 0 and is_delete = 0 and tea_id != #{@user.id} and name like '%#{@search}%'")
+      @syllabuses = @user.courses.not_deleted_not_end.where("name like '%#{@search}%'").order("updated_at desc").select{ |course| !@user.has_teacher_role(course)}
     elsif @select == "end"
       # 归档的课堂
       end_syllabuses = Course.where("is_end = 1 and name like '%#{@search}%'")
diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb
index fe996262a..123447588 100644
--- a/app/views/courses/index.html.erb
+++ b/app/views/courses/index.html.erb
@@ -15,7 +15,7 @@
     </div>
     <ul class="task-index-head-info clearfix">
       <li><span class="color-orange font-bd" id="all_syllabuses"><%= @syllabuses_num %></span><br/><span >全部</span></li>
-      <li><span class="color-orange font-bd" id="my_syllabuses"><%= @create_syllabuses_count + @join_syllabuses_count %></span><br/><span>我的课堂</span></li>
+      <li><span class="color-orange font-bd" id="my_syllabuses"><%= @my_courses_count %></span><br/><span>我的课堂</span></li>
       <%= link_to "+&nbsp;新建".html_safe, new_course_path, :class => "fr font-16 white-btn orange-btn mt10" %>
       <%= link_to "+&nbsp;加入课堂".html_safe, join_private_courses_courses_path, :remote => true, :method => "post", :class => "fr mr30 font-16 white-btn orange-btn mt10" %>
       <!--      <li><span class="color-orange font-bd"><%#= @create_syllabuses_count %></span><br/><span>你已创建</span></li>-->