From fc965a3030b9929959a2d4c90ad16cb10bfb946f Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 25 Jul 2019 11:34:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E5=A0=82=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index f5830adff..230e7f387 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -906,7 +906,6 @@ class CoursesController < ApplicationController
 
             CourseAddStudentCreateWorksJob.perform_later(course.id, [current_user.id])
             StudentJoinCourseNotifyJob.perform_later(current_user.id, course.id)
-            logger.info("#####################{course.id}")
           end
         end
 
@@ -927,14 +926,18 @@ class CoursesController < ApplicationController
 
               role = course_message.content == 2 ? '7' : '9' # 7:老师 9:助教
               ApplyTeacherRoleJoinCourseNotifyJob.perform_later(current_user.id, course.id, role)
+              teacher_role = 1
+              message = "#{course_message.content == 2 ? '教师' : '助教'}申请已提交，请等待审核"
             end
           end
         end
 
-        if current_user.student_of_course?(course) || current_user.teacher_of_course?(course)
-          render json: { status: 0, message: "成功", course_id: course.id}
+        if teacher_role && current_user.student_of_course?(course)
+          render json: { status: 0, message: message, course_id: course.id}
+        elsif current_user.student_of_course?(course)
+          render json: { status: 0, message: "加入成功", course_id: course.id}
         else
-          normal_status("申请已提交，请等待审核")
+          normal_status(message)
         end
       rescue => e
         uid_logger(e.message)