Merge branch 'develop' into dev_aliyun

app/controllers/homework_commons_controller.rb

@@ -201,12 +201,12 @@ class HomeworkCommonsController < ApplicationController
         page = params[:page] || 1
         limit = params[:limit] || 20
         @student_works = @student_works.page(page).per(limit)
-        @students = @course.students.where(user_id: @student_works.pluck(:user_id)).preload(:course_group)
         if @homework.homework_type == "practice"
           @student_works = @student_works.includes(:student_works_scores, user: :user_extension, myshixun: :games)
         else
           @student_works = @student_works.includes(:student_works_scores, :project, user: :user_extension)
         end
+        @students = @course.students.preload(:course_group)
       end
 
       if params[:format] == "xlsx"