调整

5 years ago · 979c05fd3b
parent 512bf16866
commit 979c05fd3b
1 changed files with 2 additions and 2 deletions
--- a/app/controllers/polls_controller.rb
+++ b/app/controllers/polls_controller.rb
@ -792,12 +792,12 @@ class PollsController < ApplicationController
                  if the_group_setting_status == 2
                    poll_group_params = {
                      :publish_time => the_group_setting.publish_time,
-                      :end_time => poll_end_time
+                      :end_time => poll_end_time < Time.now ? the_group_setting.end_time : poll_end_time
                    }
                  elsif the_group_setting_status == 3
                    poll_group_params = {
                      :publish_time => the_group_setting.publish_time,
-                      :end_time => the_group_setting.end_time
+                      :end_time => exercise_end_time
                    }
                  end
                  the_group_setting.update_attributes(poll_group_params)