From 77876acff36df39190dc2d575a96b6b9cea2dd52 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 24 Feb 2020 11:32:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E7=94=B1=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E5=88=87=E6=8D=A2=E4=B8=BA=E8=80=81=E5=B8=88?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E6=97=B6=E5=88=A0=E9=99=A4=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 35a60f692..baa8b0d85 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -749,8 +749,8 @@ class CoursesController < ApplicationController
       ActiveRecord::Base.transaction do
         course_student.destroy!
         course_teacher.update!(is_active: 1)
+        CourseDeleteStudentDeleteWorksJob.perform_later(@course.id, [current_user.id])
       end
-      CourseDeleteStudentDeleteWorksJob.perform_later(@course.id, [current_user.id])
       normal_status(0, "切换成功")
     rescue => e
       uid_logger_error(e.message)
@@ -761,12 +761,15 @@ class CoursesController < ApplicationController
   # 切换为助教
   def switch_to_assistant
     begin
-      course_member = @course.course_members.find_by!(user_id: current_user.id, is_active: 1)
-      tip_exception("切换失败") unless course_member.STUDENT?
+      course_student = @course.course_members.find_by!(user_id: current_user.id, is_active: 1)
+      tip_exception("切换失败") unless course_student.present?
 
       course_teacher = CourseMember.find_by!(user_id: current_user.id, role: %i[ASSISTANT_PROFESSOR], course_id: @course.id)
-      course_member.update!(is_active: 0)
-      course_teacher.update!(is_active: 1)
+      ActiveRecord::Base.transaction do
+        course_student.destroy!
+        course_teacher.update!(is_active: 1)
+        CourseDeleteStudentDeleteWorksJob.perform_later(@course.id, [current_user.id])
+      end
       normal_status(0, "切换成功")
     rescue => e
       uid_logger_error(e.message)