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

merge tj
5 years ago · 37aa2937ec
parent eb29e6ffe7 45a6dc1f3c
commit 37aa2937ec
1 changed files with 3 additions and 3 deletions
--- a/app/controllers/admins/shixun_settings_controller.rb
+++ b/app/controllers/admins/shixun_settings_controller.rb
@ -83,9 +83,9 @@ class Admins::ShixunSettingsController < Admins::BaseController
      sheet1[count_row, 6] = shixun.myshixuns_count
      sheet1[count_row, 7] = shixun.myshixuns.select{|m| m.status == 1}.size
      sheet1[count_row, 8] = shixun.shixun_status
-      sheet1[count_row, 9] = shixun.user.show_real_name
-      sheet1[count_row, 10] = shixun.user.school_name
-      sheet1[count_row, 11] = shixun.user.identity
+      sheet1[count_row, 9] = shixun.user&.show_real_name
+      sheet1[count_row, 10] = shixun.user&.school_name
+      sheet1[count_row, 11] = shixun.user&.identity
      shixun.challenges.each do |challenge|
        sheet1[count_row, 12] = "第#{challenge.position}关"
        sheet1[count_row, 13] = challenge.subject