diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index 168d05299..e9dc58ee9 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -439,6 +439,7 @@ class HomeworkCommonsController < ApplicationController
   def settings
     @user = current_user
     @work = @homework.user_work(current_user.id) if @user_course_identity == Course::STUDENT
+    @course_groups = @course.course_groups.where(id: @course.charge_group_ids(@current_user))
   end
 
   def update_settings
diff --git a/app/views/homework_commons/settings.json.jbuilder b/app/views/homework_commons/settings.json.jbuilder
index 75604de0c..f62dde87e 100644
--- a/app/views/homework_commons/settings.json.jbuilder
+++ b/app/views/homework_commons/settings.json.jbuilder
@@ -7,7 +7,7 @@ json.partial! "student_btn_check", locals: {identity: @user_course_identity, hom
 json.(@homework, :unified_setting, :publish_time, :end_time, :late_penalty, :allow_late, :late_time, :work_public,
     :score_open, :answer_public)
 
-json.group_settings @course.course_groups do |group|
+json.group_settings @course_groups do |group|
   json.group_id group.id
   json.group_name group.name
   json.publish_time group_homework_setting(@homework, group.id).try(:publish_time)