|
|
|
@ -66,7 +66,7 @@ class GraduationTasksController < ApplicationController
|
|
|
|
|
@course.teacher_group_user_ids(current_user.id)
|
|
|
|
|
else
|
|
|
|
|
course_group_id = @course.course_member(current_user.id).course_group_id
|
|
|
|
|
@course.course_members.where(course_group_id: course_group_id).pluck(:user_id)
|
|
|
|
|
@course.students.where(course_group_id: course_group_id).pluck(:user_id)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
@work_list = @task.graduation_works.where(user_id: user_ids).includes(user: [:user_extension])
|
|
|
|
@ -89,7 +89,7 @@ class GraduationTasksController < ApplicationController
|
|
|
|
|
|
|
|
|
|
# 分班情况
|
|
|
|
|
unless params[:course_group].blank?
|
|
|
|
|
group_user_ids = @course.course_members.where(course_group_id: params[:course_group]).pluck(:user_id)
|
|
|
|
|
group_user_ids = @course.students.where(course_group_id: params[:course_group]).pluck(:user_id)
|
|
|
|
|
# 有分组只可能是老师身份查看列表
|
|
|
|
|
@work_list = @work_list.where(user_id: group_user_ids)
|
|
|
|
|
end
|
|
|
|
|