diff --git a/app/controllers/colleges_controller.rb b/app/controllers/colleges_controller.rb
index fff508a8..1ffcdb46 100644
--- a/app/controllers/colleges_controller.rb
+++ b/app/controllers/colleges_controller.rb
@@ -131,7 +131,7 @@ class CollegesController < ApplicationController
                (select count(m.id) from messages m inner join boards b on  b.id=m.board_id and b.parent_id=0 where b.course_id=c.id group by c.id) as messages_count,
                c.tea_id, c.name, c.is_end,
                (SELECT MAX(created_at) FROM `course_activities` ca WHERE ca.course_id = c.id) AS update_time
-               FROM `courses` c WHERE (c.school_id = #{@school.id} and c.is_delete = 0)")
+               FROM `courses` c join user_extensions ue on ue.user_id = c.tea_id WHERE (ue.school_id = #{@school.id} and c.is_delete = 0)")
 
     @courses.each do |course|
       course[:evaluating_count] = Output.find_by_sql("select sum(g.evaluate_count) as evaluating_count from games g inner join
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index e87c7297..669cc58f 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -577,7 +577,7 @@ class CoursesController < ApplicationController
           cha_member.member_roles.where("role_id = 10").first.destroy
           StudentsForCourse.where(:course_id => @course.id, :student_id => cha_member.user_id).destroy_all
         end
-        @course.update_attributes(:tea_id => cha_member.user_id)
+        @course.update_attributes(:tea_id => cha_member.user_id, :school_id => cha_member.user.try(:user_extensions).try(:school_id))
         man_member.member_roles.first.update_attributes(:role_id => 9)
         course_act = CourseActivity.where(:course_id => @course.id, :course_act_id => @course.id, :course_act_type => 'Course').first
         course_act.update_column('user_id', cha_member.user_id)