From b4fa106873267fd5d74e578396226e5165b9ae3d Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 22 Jun 2019 10:36:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E5=8F=91=E5=B8=83=E6=97=B6?=
 =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E6=9C=AA=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index bb37283ca..ee6cc80e0 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -907,10 +907,9 @@ class HomeworkCommonsController < ApplicationController
                 # 创建作业分班设置：homework_group_setting
                 create_homework_group_settings(homework)
 
-                # 选中的分班设置的发布时间改为当前时间，截止时间不为空的保持原状，为空的改为一个月后
-                homework.homework_group_settings.where(course_group_id: publish_groups).update_all(publish_time: Time.now)
-                homework.homework_group_settings.where(course_group_id: publish_groups, end_time: nil).
-                    update_all(end_time: params[:end_time])
+                # 选中的分班设置的发布时间改为当前时间，截止时间改为传的截止时间参数
+                homework.homework_group_settings.where(course_group_id: publish_groups).update_all(publish_time: Time.now,
+                                                                                                   end_time: params[:end_time])
                 # 发消息
                 tiding_group_ids = publish_groups
               end
@@ -938,8 +937,7 @@ class HomeworkCommonsController < ApplicationController
             create_homework_group_settings(homework)
 
             none_publish_settings = homework.homework_group_settings.where(course_group_id: publish_groups).none_published
-            none_publish_settings.update_all(publish_time: Time.now)
-            none_publish_settings.where(end_time: nil).update_all(end_time: params[:end_time])
+            none_publish_settings.update_all(publish_time: Time.now, end_time: params[:end_time])
             if homework.max_group_end_time
               homework.end_time = homework.max_group_end_time
             end