diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 966f23a3c..e2dd23552 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -381,6 +381,7 @@ class StudentWorkController < ApplicationController
@is_evaluation = @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status == 2 && !@is_teacher #是不是匿评
@show_all = false
+ # 0表示没有分组的学生,-1表示所有分组的学生
if @group
if @group == "0"
none_group_students = @course.members.select{ |member| member.course_group_id == 0 }
diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb
index 9c69f5259..e77b19511 100644
--- a/app/controllers/syllabuses_controller.rb
+++ b/app/controllers/syllabuses_controller.rb
@@ -88,7 +88,7 @@ class SyllabusesController < ApplicationController
end
def destroy
- if @syllabus && @syllabus.courses.empty?
+ if @syllabus && @syllabus.courses.not_deleted.empty?
@syllabus.destroy
redirect_to user_courselist_user_path(User.current.id)
end
diff --git a/app/views/syllabuses/_delete_syllabus.html.erb b/app/views/syllabuses/_delete_syllabus.html.erb
index b043186aa..a72a87c03 100644
--- a/app/views/syllabuses/_delete_syllabus.html.erb
+++ b/app/views/syllabuses/_delete_syllabus.html.erb
@@ -1,6 +1,6 @@