Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/exercises_controller.rb

@@ -694,6 +694,7 @@ class ExercisesController < ApplicationController
 
   #首页批量或单独 立即发布,应是跳出弹窗，设置开始时间和截止时间。
   def publish
+    group_ids = params[:group_ids]&.reject(&:blank?)
     if params[:detail].blank?
       tip_exception("缺少截止时间参数") if params[:end_time].blank?
       tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
@@ -701,7 +702,6 @@ class ExercisesController < ApplicationController
         @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
     else
       group_end_times = params[:group_end_times].reject(&:blank?).map{|time| time.to_time}
-      group_ids = params[:group_ids].reject(&:blank?)
       tip_exception("缺少截止时间参数") if group_end_times.blank?
       tip_exception("截止时间和分班参数的个数不一致") if group_end_times.length != group_ids.length
       group_end_times.each do |time|

app/controllers/homework_commons_controller.rb

@@ -1044,6 +1044,7 @@ class HomeworkCommonsController < ApplicationController
 
   def publish_homework
     tip_exception("请至少选择一个分班") if params[:group_ids].blank? && @course.course_groups.size != 0
+    group_ids = params[:group_ids]&.reject(&:blank?)
     if params[:detail].blank?
       tip_exception("缺少截止时间参数") if params[:end_time].blank?
       tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
@@ -1051,7 +1052,6 @@ class HomeworkCommonsController < ApplicationController
         @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
     else
       group_end_times = params[:group_end_times].reject(&:blank?).map{|time| time.to_time}
-      group_ids = params[:group_ids].reject(&:blank?)
       tip_exception("缺少截止时间参数") if group_end_times.blank?
       tip_exception("截止时间和分班参数的个数不一致") if group_end_times.length != group_ids.length
       group_end_times.each do |time|

app/controllers/polls_controller.rb

@@ -254,6 +254,7 @@ class PollsController < ApplicationController
 
   #首页批量或单独 立即发布,应是跳出弹窗，设置开始时间和截止时间。
   def publish
+    group_ids = params[:group_ids]&.reject(&:blank?)
     if params[:detail].blank?
       tip_exception("缺少截止时间参数") if params[:end_time].blank?
       tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
@@ -261,7 +262,6 @@ class PollsController < ApplicationController
         @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
     else
       group_end_times = params[:group_end_times].reject(&:blank?).map{|time| time.to_time}
-      group_ids = params[:group_ids].reject(&:blank?)
       tip_exception("缺少截止时间参数") if group_end_times.blank?
       tip_exception("截止时间和分班参数的个数不一致") if group_end_times.length != group_ids.length
       group_end_times.each do |time|