实训作业列表

5 years ago · b54312e729
parent 7a9fd75701
commit b54312e729
1 changed files with 1 additions and 1 deletions
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@ -149,7 +149,7 @@ class HomeworkCommon < ApplicationRecord

  # 作业能否立即截止
  def end_immediately charge_ids
-    (unified_setting && homework_detail_manual.try(:comment_status) == 1 && end_time > Time.now) ||
+    (unified_setting && homework_detail_manual.try(:comment_status) == 1 && end_time.present? && end_time > Time.now) ||
      homework_group_settings.select{|setting| charge_ids.include?(setting.course_group_id) &&
        !setting.publish_time.nil? && setting.publish_time < Time.now && setting.end_time > Time.now}.size > 0
  end