Merge branch 'develop' into dev_aliyun

5 years ago · 2575168d2f
parent baf628d7bc bf117d2dad
commit 2575168d2f
1 changed files with 1 additions and 1 deletions
--- a/app/views/competitions/competitions/charts.json.jbuilder
+++ b/app/views/competitions/competitions/charts.json.jbuilder
@ -4,7 +4,7 @@ json.user_ranks @user_ranks.each do |user_rank|
  json.rank rank == 0 ? "--" : rank
  json.team_name user_rank.name
  json.user_name user_rank.user.real_name
-  json.cost_time rank == 0 && user_rank.cost_time ? "--" : com_spend_time(user_rank.cost_time)
+  json.cost_time rank == 0 || !user_rank.cost_time ? "--" : com_spend_time(user_rank.cost_time)
  json.score rank == 0 ? "--" : user_rank.score.round(2)
  json.competition_prize user_rank.competition_prize
 end