From 00e2eb4017422c84f121f346834129cf33376a06 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 20 Aug 2019 13:53:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E5=A0=82=E6=97=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=BE=E7=A8=8B=E6=98=AF=E5=90=A6=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index aaf24eadb..8a532a9ad 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -906,15 +906,17 @@ class CoursesController < ApplicationController
         # 邀请码验证
         return normal_status(-1, "邀请码不能为空") if params[:invite_code].blank?
         invite_code = params[:invite_code]
-        course = Course.find_by(invite_code: invite_code, is_delete: 0, invite_code_halt: 0, is_end: 0)
+        course = Course.find_by(invite_code: invite_code, is_delete: 0, invite_code_halt: 0)
         course_group = CourseGroup.find_by(invite_code: invite_code)
         if course.blank?
           return normal_status(-1, "邀请码无效") if course_group.blank?
 
-          course = Course.find_by(id: course_group.course_id, is_delete: 0, invite_code_halt: 0, is_end: 0)
+          course = Course.find_by(id: course_group.course_id, is_delete: 0, invite_code_halt: 0)
           return normal_status(-1, "邀请码无效") if course.blank?
         end
 
+        return normal_status(-1, "课堂已结束，无法加入") if course.is_end
+
         # 实名认证和职业认证的身份判断
         return normal_status(-1, "该课堂要求成员完成实名和职业认证") if course.authentication &&
             course.professional_certification && (!current_user.authentication || !current_user.professional_certification)