合并出错

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[:course_password] == course.password
-            if params[:role] == "10"
+                if params[:role] == "10"
-              members = []
+                  members = []
-              members << Member.new(:role_ids => [10], :user_id => current_user.id)
+                  members << Member.new(:role_ids => [10], :user_id => current_user.id)
-              course.members << members
+                  course.members << members
-              StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
+                  StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
-              @state = 0
+                  @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
-              #如果已经发送过消息了，那么就要给个提示
+              @state = 1
-              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
-            @state = 1
-          end
         end
       end
     else