毕设任务作品列表双重身份的过滤

dev_course
cxt 6 years ago
parent acae3a9681
commit 4519abbce4

@ -66,7 +66,7 @@ class GraduationTasksController < ApplicationController
@course.teacher_group_user_ids(current_user.id) @course.teacher_group_user_ids(current_user.id)
else else
course_group_id = @course.course_member(current_user.id).course_group_id 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 end
@work_list = @task.graduation_works.where(user_id: user_ids).includes(user: [:user_extension]) @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? 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) @work_list = @work_list.where(user_id: group_user_ids)
end end

@ -139,9 +139,9 @@ class Course < ApplicationRecord
def teacher_group_user_ids user_id def teacher_group_user_ids user_id
teachers = teacher_course_groups.where(user_id: user_id) teachers = teacher_course_groups.where(user_id: user_id)
if teachers.exists? if teachers.exists?
course_members.where(course_group_id: teachers.pluck(:course_group_id)).pluck(:user_id) students.where(course_group_id: teachers.pluck(:course_group_id)).pluck(:user_id)
else else
course_members.where(role: 4).pluck(:user_id) students.pluck(:user_id)
end end
end end

Loading…
Cancel
Save