From 80ec5b0b5091a7f96d3c4637d40e3a1566dc4069 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 27 Oct 2015 14:30:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/courses_service.rb | 39 +++++++++++++++------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 131fdcd88..807a26232 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -325,30 +325,27 @@ class CoursesService
           else
             @state = 1
           end
-          else
-            @state = 1
-          end
         else
-          if params[:course_password] == course.password
-            if params[:role] == "10"
-              members = []
-              members << Member.new(:role_ids => [10], :user_id => current_user.id)
-              course.members << members
-              StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
-              @state = 0
+            if params[:course_password] == course.password
+                if params[:role] == "10"
+                  members = []
+                  members << Member.new(:role_ids => [10], :user_id => current_user.id)
+                  course.members << members
+                  StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
+                  @state = 0
+                else
+                  #如果已经发送过消息了，那么就要给个提示
+                    if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0").count != 0
+                      @state = 7
+                    else
+                      Mailer.run.join_course_request(course, User.current, params[:role])
+                      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',:status=>0)
+                      @state = 6
+                    end
+                end
             else
-              #如果已经发送过消息了，那么就要给个提示
-              if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0").count != 0
-                @state = 7
-              else
-                Mailer.run.join_course_request(course, User.current, params[:role])
-                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',:status=>0)
-                @state = 6
-              end
+              @state = 1
             end
-          else
-            @state = 1
-          end
         end
       end
     else