diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 58e5120de..a3030a728 100644
--- 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