diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index e4d644192..05eec5365 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -90,6 +90,10 @@ class HomeworkCommonController < ApplicationController
           @homework.homework_tests.destroy_all
         elsif @homework.homework_type == 3
           @homework.homework_detail_group.destroy if @homework.homework_detail_group
+          create_works_list @homework
+        end
+        if params[:homework_type].to_i == 3
+          @homework.student_works.destroy_all
         end
       end
       @homework.homework_type = params[:homework_type].to_i || @homework.homework_type
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 81c915167..f97696b67 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3676,7 +3676,7 @@ end
 def create_works_list homework
   unless homework.course.nil?
     students = homework.course.student
-    if !students.empty?
+    if !students.empty? && homework.student_works.empty?
     name = homework.name
     name_str = name + "的作品提交"
     str = ""