From cb6ce3b52acc565b45d64b19a742962b0ab73873 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 10 Dec 2019 11:50:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=9A=84=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index bba78ceb7..9a3eec9ca 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -361,15 +361,16 @@ class FilesController < ApplicationController
   def publish_params
     tip_exception("缺少发布参数") if params[:delay_publish].blank?
     @unified_setting = 1
-    if params[:delay_publish].to_i == 1 && @course.course_group_module? && @course.course_groups_count != 0
-      tip_exception("分班发布设置不能为空") if params[:group_settings].blank?
-      min_publish_time = params[:group_settings].pluck(:publish_time).reject(&:blank?).min
-      max_publish_time = params[:group_settings].pluck(:publish_time).reject(&:blank?).max
-      tip_exception("分班发布设置不能为空") if min_publish_time.blank?
-
-      # 分班设置中的时间一样且包含所有分班 则按统一设置处理，否则是非统一设置
-      @unified_setting = 0 unless min_publish_time == max_publish_time && params[:group_settings].pluck(:group_id).flatten.sort == @course.course_groups.pluck(:id).sort
-    elsif params[:delay_publish].to_i == 1
+    # if params[:delay_publish].to_i == 1 && @course.course_group_module? && @course.course_groups_count != 0
+    #   tip_exception("分班发布设置不能为空") if params[:group_settings].blank?
+    #   min_publish_time = params[:group_settings].pluck(:publish_time).reject(&:blank?).min
+    #   max_publish_time = params[:group_settings].pluck(:publish_time).reject(&:blank?).max
+    #   tip_exception("分班发布设置不能为空") if min_publish_time.blank?
+    #
+    #   # 分班设置中的时间一样且包含所有分班 则按统一设置处理，否则是非统一设置
+    #   @unified_setting = 0 unless min_publish_time == max_publish_time && params[:group_settings].pluck(:group_id).flatten.sort == @course.course_groups.pluck(:id).sort
+    # els
+    if params[:delay_publish].to_i == 1
       tip_exception("缺少延期发布的时间参数") if params[:publish_time].blank?
       min_publish_time = params[:publish_time]
     end