Merge branch 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm

app/controllers/courses_controller.rb

@@ -152,7 +152,7 @@ class CoursesController < ApplicationController
         end
       rescue => e
         uid_logger_error(e.message)
-        tip_exception("课堂创建失败！")
+        tip_exception(e.message)
         raise ActiveRecord::Rollback
       end
     end

app/controllers/shixuns_controller.rb

@@ -564,7 +564,7 @@ class ShixunsController < ApplicationController
 
 			# 如果该实训是金课中的实训，则将当前用户加入到当期开课的课堂
 			if StageShixun.exists?(shixun_id: @shixun.id, subject_id: Subject.where(excellent: 1))
-				subject = Subject.where(id: StageShixun.where(shixun_id: @shixun.id).pluck(:subject_id), excellent: 1).take(1)
+				subject = Subject.find_by(id: StageShixun.where(shixun_id: @shixun.id).pluck(:subject_id), excellent: 1)
 				course = subject.courses.where("start_date is not null and start_date <= '#{Date.today}' and end_date is not null and end_date >= '#{Date.today}'").take
 				if course.present? && !CourseMember.exists?(course_id: course.id, user_id: current_user.id)
 					# 为了不影响后续操作，用create而不是create!