From cf83209c58a4dfb4472bf39c8a3606a662f35c49 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 24 Oct 2015 12:03:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E8=A2=AB=E8=A6=86=E7=9B=96=E4=BA=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index fe9318006..56252253a 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -31,17 +31,17 @@ class CoursesController < ApplicationController
 
   def join
     if User.current.logged?
-      if params[:role] == 10
+     # if params[:role] == 10
         cs = CoursesService.new
         @user = User.current
-        join = cs.join_course params,user
+        join = cs.join_course params,@user
         @state = join[:state]
         @course = join[:course]
-      else
-        @course = Course.find_by_id params[:object_id]
-        CourseMessage.create(:user_id => @course.tea_id, :course_id => @course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest')
-        @state = 6
-      end
+      # else
+      #   @course = Course.find_by_id params[:object_id]
+      #   CourseMessage.create(:user_id => @course.tea_id, :course_id => @course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest')
+      #   @state = 6
+      # end
     else
       @state = 5 #未登录
     end