From 2a20b82e26184d53304df671584df29a7bbb7c19 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 28 Oct 2019 17:40:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E5=AE=9E=E8=AE=AD=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E7=9A=84=E7=AB=9E=E8=B5=9B=EF=BC=8C=E5=B0=86=E6=8E=92=E8=A1=8C?=
 =?UTF-8?q?=E6=A6=9C=E7=9A=84=E8=AE=BE=E7=BD=AE=E5=88=A0=E9=99=A4=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E5=AD=90=E9=98=B6=E6=AE=B5=EF=BC=8C=E8=BF=98=E4=BF=9D?=
 =?UTF-8?q?=E7=95=991=E4=B8=AAtab=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=8A=A5?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admins/competition_stage_create_service.rb   | 16 +++++++++-------
 .../admins/competition_stage_update_service.rb   | 16 +++++++++-------
 .../admins/competition_settings/index.html.erb   |  3 ++-
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/services/admins/competition_stage_create_service.rb b/app/services/admins/competition_stage_create_service.rb
index cc7b338e4..dc0e65991 100644
--- a/app/services/admins/competition_stage_create_service.rb
+++ b/app/services/admins/competition_stage_create_service.rb
@@ -10,13 +10,15 @@ class Admins::CompetitionStageCreateService < ApplicationService
     ActiveRecord::Base.transaction do
       stage = CompetitionStage.create!(competition_id: competition.id, name: params[:stage_name], score_rate: (params[:score_rate].to_i / 100).round(2))
 
-      params[:stage].each do |section|
-        stage_section = CompetitionStageSection.create!(competition_id: competition.id, competition_stage_id: stage.id,
-                                                        start_time: section["start_time"], end_time: section["end_time"],
-                                                        entry: section["entry"], score_source: section["score_source"])
-        section["identifiers"].each do |identifier|
-          CompetitionEntry.create!(competition_stage_section_id: stage_section.id, competition_stage_id: stage.id,
-                                   shixun_identifier: identifier)
+      unless params[:stage].blank?
+        params[:stage].each do |section|
+          stage_section = CompetitionStageSection.create!(competition_id: competition.id, competition_stage_id: stage.id,
+                                                          start_time: section["start_time"], end_time: section["end_time"],
+                                                          entry: section["entry"], score_source: section["score_source"])
+          section["identifiers"].each do |identifier|
+            CompetitionEntry.create!(competition_stage_section_id: stage_section.id, competition_stage_id: stage.id,
+                                     shixun_identifier: identifier)
+          end
         end
       end
 
diff --git a/app/services/admins/competition_stage_update_service.rb b/app/services/admins/competition_stage_update_service.rb
index 1e5501260..a3988d417 100644
--- a/app/services/admins/competition_stage_update_service.rb
+++ b/app/services/admins/competition_stage_update_service.rb
@@ -13,13 +13,15 @@ class Admins::CompetitionStageUpdateService < ApplicationService
 
       stage.competition_stage_sections.destroy_all
 
-      params[:stage].each do |section|
-        stage_section = CompetitionStageSection.create!(competition_id: competition.id, competition_stage_id: stage.id,
-                                                        start_time: section["start_time"], end_time: section["end_time"],
-                                                        entry: section["entry"], score_source: section["score_source"])
-        section["identifiers"].each do |identifier|
-          CompetitionEntry.create!(competition_stage_section_id: stage_section.id, competition_stage_id: stage.id,
-                                   shixun_identifier: identifier)
+      unless params[:stage].blank?
+        params[:stage].each do |section|
+          stage_section = CompetitionStageSection.create!(competition_id: competition.id, competition_stage_id: stage.id,
+                                                          start_time: section["start_time"], end_time: section["end_time"],
+                                                          entry: section["entry"], score_source: section["score_source"])
+          section["identifiers"].each do |identifier|
+            CompetitionEntry.create!(competition_stage_section_id: stage_section.id, competition_stage_id: stage.id,
+                                     shixun_identifier: identifier)
+          end
         end
       end
 
diff --git a/app/views/admins/competition_settings/index.html.erb b/app/views/admins/competition_settings/index.html.erb
index 73bc343d6..a03e1e351 100644
--- a/app/views/admins/competition_settings/index.html.erb
+++ b/app/views/admins/competition_settings/index.html.erb
@@ -360,7 +360,7 @@
                   </div><span class=" mt-2">%</span>
                   <div class="flex-1">
                     <a href="javascript:void(0)" class="btn btn-outline-primary export-action ml20 add-task-sub">新增子阶段</a>
-                    <% if stage.max_end_time > Time.now %>
+                    <% if stage.max_end_time && stage.max_end_time > Time.now %>
                       <%= agree_link '发送短信提醒', send_message_admins_competition_competition_stage_path(@competition, stage, element: ".send-message-#{stage.id}"),
                                      class: 'btn btn-outline-primary ml20', 'data-confirm': '确认执行发送短信操作？' %>
                     <% end %>
@@ -492,6 +492,7 @@
             </div>
           <% end %>
         <% end %>
+        <div class="error my-2 danger text-danger"></div>
       </div>
     </div>
   </div>