From b12559ad4c16afb5a2f7aab912430e1cb0737645 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 16 Dec 2019 14:18:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20191213101853_migrate_student_work_compelete_status.rb   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/migrate/20191213101853_migrate_student_work_compelete_status.rb b/db/migrate/20191213101853_migrate_student_work_compelete_status.rb
index 5bb4a2699..da45ccfac 100644
--- a/db/migrate/20191213101853_migrate_student_work_compelete_status.rb
+++ b/db/migrate/20191213101853_migrate_student_work_compelete_status.rb
@@ -2,10 +2,10 @@ class MigrateStudentWorkCompeleteStatus < ActiveRecord::Migration[5.2]
   def change
     student_works = StudentWork.where("myshixun_id is not null and myshixun_id != 0")
     student_works.includes(homework_common: :homework_challenge_settings, myshixun: :games).find_each do |work|
-      if work.myshixun
+      if work.myshixun && work.homework_common
         myshixun = work.myshixun
         homework= work.homework_common
-        setting_time = homework.homework_group_setting myshixun.user_id
+        setting_time = homework.homework_group_setting(myshixun.user_id)
         homework_end_or_late_time = homework.allow_late ? homework.late_time : setting_time.end_time
         challenge_ids = homework.homework_challenge_settings.pluck(:challenge_id)
         games = myshixun.games.select{ |game| challenge_ids.include?(game.challenge_id) }