From 91eecc3ffe9155678c7d0156820da31195e5da08 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 26 Oct 2019 20:09:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/competitions_helper.rb                     | 6 ++++--
 app/services/admins/competition_nav_setting_service.rb | 2 +-
 app/views/admins/competition_settings/index.html.erb   | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/helpers/competitions_helper.rb b/app/helpers/competitions_helper.rb
index 6b75e6aac..b980aba3d 100644
--- a/app/helpers/competitions_helper.rb
+++ b/app/helpers/competitions_helper.rb
@@ -38,8 +38,10 @@ module CompetitionsHelper
   def chart_stages competition
     stages = []
     statistic_stages = competition.competition_stages.where("score_rate > 0")
-    if competition.max_stage_end_time && competition.max_stage_end_time < Time.now && statistic_stages.size > 1
-      stages << {id: nil, name: "总排行榜", rate: 1.0, start_time: competition.start_time, end_time: competition.end_time}
+
+    end_time = competition.max_stage_end_time || competition.end_time
+    if end_time && end_time < Time.now
+      stages << {id: nil, name: statistic_stages.size > 1 ? "总排行榜" : "排行榜", rate: 1.0, start_time: competition.start_time, end_time: competition.end_time}
     end
 
     statistic_stages.each do |stage|
diff --git a/app/services/admins/competition_nav_setting_service.rb b/app/services/admins/competition_nav_setting_service.rb
index 8e45980c5..43aefdea0 100644
--- a/app/services/admins/competition_nav_setting_service.rb
+++ b/app/services/admins/competition_nav_setting_service.rb
@@ -21,7 +21,7 @@ class Admins::CompetitionNavSettingService < ApplicationService
         else
           com_module = CompetitionModule.create!(competition_id: competition.id, module_type: 'md')
         end
-        com_module.update_attributes!(hidden: nav["hidden"] ? 0 : 1, position: nav["position"] ? nav["position"] : com_module.position, name: nav["name"], url: nav["url"])
+        com_module.update_attributes!(hidden: nav["hidden"] ? 0 : 1, position: nav["position"] ? nav["position"] : com_module.length + 1, name: nav["name"], url: nav["url"])
       end
 
       delete_module_ids = old_module_ids - module_ids
diff --git a/app/views/admins/competition_settings/index.html.erb b/app/views/admins/competition_settings/index.html.erb
index 94f28d69d..c78c82843 100644
--- a/app/views/admins/competition_settings/index.html.erb
+++ b/app/views/admins/competition_settings/index.html.erb
@@ -325,7 +325,7 @@
 </div>
 
 
-<% if @competition.mode == 1 %>
+<%# if @competition.mode == 1 %>
   <div class="card mb-5 competition-chart-stages">
     <div class="card-header d-flex justify-content-between align-items-center">
       <span>排行榜设置</span>
@@ -493,4 +493,4 @@
     </div>
   </div>
   <div style="margin-bottom: 8.5rem;"></div>
-<% end %>
\ No newline at end of file
+<%# end %>
\ No newline at end of file