From ab91bf8b4a23c05270f9a1eff08c9da26981a0cd Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 17 Dec 2019 14:46:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=8F=AD=E7=9A=84=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/weapps/courses_controller.rb    | 4 ++--
 app/views/weapps/courses/students.json.jbuilder | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/controllers/weapps/courses_controller.rb b/app/controllers/weapps/courses_controller.rb
index cd8300e1e..cb3c195d6 100644
--- a/app/controllers/weapps/courses_controller.rb
+++ b/app/controllers/weapps/courses_controller.rb
@@ -93,8 +93,8 @@ class Weapps::CoursesController < Weapps::BaseController
     end
 
     if course_group_id.present?
-      course_group = CourseGroup.find(course_group_id) if course_group_id != 0
-      @students = @students.where(course_group_id: course_group&.id.to_i)
+      @course_group = CourseGroup.find(course_group_id) if course_group_id != 0
+      @students = @students.where(course_group_id: @course_group&.id.to_i)
     end
 
     @students_count = @students.size
diff --git a/app/views/weapps/courses/students.json.jbuilder b/app/views/weapps/courses/students.json.jbuilder
index 5aaaee0aa..15255ef3b 100644
--- a/app/views/weapps/courses/students.json.jbuilder
+++ b/app/views/weapps/courses/students.json.jbuilder
@@ -1,2 +1,5 @@
 json.students student_list @students, @course.excellent
-json.students_count @students_count
\ No newline at end of file
+json.students_count @students_count
+json.course_group do
+  json.(@course_group, :id, :name, :invite_code, :course_members_count)
+end
\ No newline at end of file