From 778b1811a0bfffad0c04a08a22b40925edf03b4b Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 15 Oct 2019 14:16:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=81=E5=B8=88=E5=88=87=E6=8D=A2=E4=B8=BA?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=BA=AB=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb      | 18 ++++++++++++------
 app/views/courses/top_banner.json.jbuilder |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 0c643d15c..2804b6d9c 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -35,7 +35,7 @@ class CoursesController < ApplicationController
                                          :transfer_to_course_group, :delete_from_course, :export_member_scores_excel,
                                          :search_users, :add_students_by_search, :get_historical_courses, :add_teacher_popup,
                                          :add_teacher, :export_couser_info, :export_member_act_score,
-                                         :update_informs, :new_informs, :delete_informs]
+                                         :update_informs, :new_informs, :delete_informs, :switch_to_student]
   before_action :admin_allowed, only: [:set_invite_code_halt, :set_public_or_private, :change_course_admin,
                                        :set_course_group, :create_group_by_importing_file,
                                        :update_task_position, :tasks_list]
@@ -681,13 +681,19 @@ class CoursesController < ApplicationController
         course_member = @course.course_members.find_by!(user_id: current_user.id, is_active: 1)
         tip_exception("切换失败") if course_member.STUDENT?
 
-        course_student = CourseMember.find_by!(user_id: current_user.id, role: %i[STUDENT], course_id: @course.id)
-        course_member.update_attributes(is_active: 0)
-        course_student.update_attributes(is_active: 1)
+        course_student = CourseMember.find_by(user_id: current_user.id, role: %i[STUDENT], course_id: @course.id)
+        if course_student
+          course_student.update_attributes!(is_active: 1)
+        else
+          # 学生身份不存在则创建
+          CourseMember.create!(user_id: current_user.id, role: %i[STUDENT], course_id: @course.id)
+          CourseAddStudentCreateWorksJob.perform_later(@course.id, [current_user.id])
+        end
+        course_member.update_attributes!(is_active: 0)
         normal_status(0, "切换成功")
       rescue => e
         uid_logger_error("switch_to_student error: #{e.message}")
-        tip_exception("切换失败")
+        tip_exception(e.message)
         raise ActiveRecord::Rollback
       end
     end
@@ -1127,7 +1133,7 @@ class CoursesController < ApplicationController
 
   def top_banner
     @user = current_user
-    @is_teacher = @user_course_identity < Course::STUDENT
+    @switch_student = Course::BUSINESS < @user_course_identity < Course::STUDENT
     @is_student = @user_course_identity == Course::STUDENT
     @course.increment!(:visits)
   end
diff --git a/app/views/courses/top_banner.json.jbuilder b/app/views/courses/top_banner.json.jbuilder
index 877ffcdf1..9a0554585 100644
--- a/app/views/courses/top_banner.json.jbuilder
+++ b/app/views/courses/top_banner.json.jbuilder
@@ -15,7 +15,7 @@ json.is_admin @user_course_identity < Course::PROFESSOR
 json.is_public @course.is_public == 1
 json.code_halt @course.invite_code_halt == 1
 json.invite_code @course.invite_code_halt == 0 ? @course.generate_invite_code : ""
-json.switch_to_student switch_student_role(@is_teacher, @course, @user)
+json.switch_to_student @switch_student
 json.switch_to_teacher switch_teacher_role(@is_student, @course, @user)
 json.switch_to_assistant switch_assistant_role(@is_student, @course, @user)
 #json.join_course !@user.member_of_course?(@course)