From 91068b0c388d991f7eef98ae47d607c08f8f5f5e Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Thu, 14 Nov 2019 19:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=AB=8B=E5=8D=B3=E6=88=AA?=
 =?UTF-8?q?=E6=AD=A2=E7=9A=84=E5=87=BA=E7=8E=B0=E4=B8=8E=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercises_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index 102469043..c4f32c438 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -1627,8 +1627,9 @@ class ExercisesController < ApplicationController
             ex_and_user = user_groups_id & ex_group_settings   #用户已设置的分班
             unpublish_group =  unpublish_group + ex_and_user - ex_ended_groups   #已发布的全部班级减去截止的全部班级
           else
+            ex_ended_groups = ex_all_group_settings.exercise_group_ended.pluck(:course_group_id).uniq
             ex_and_user = user_groups_id & ex_group_settings   #用户已设置的分班
-            unpublish_group = unpublish_group + ex_and_user
+            unpublish_group = unpublish_group + ex_and_user - ex_ended_groups
           end
         end
       end