接口调整

dev_course
cxt 5 years ago
parent f695bf0f7a
commit d8621fc366

@ -739,8 +739,6 @@ class CoursesController < ApplicationController
# 获取历史课堂,即用户管理的所有课堂以及课堂下的分班(去除当前课堂) # 获取历史课堂,即用户管理的所有课堂以及课堂下的分班(去除当前课堂)
def get_historical_courses def get_historical_courses
user_id = current_user.id
@courses = Course.where.not(id: @course.id).joins(:course_members). @courses = Course.where.not(id: @course.id).joins(:course_members).
where(is_delete: 0, course_members: {user_id: current_user.id, role: %i[CREATOR PROFESSOR ASSISTANT_PROFESSOR]}).includes(:course_groups) where(is_delete: 0, course_members: {user_id: current_user.id, role: %i[CREATOR PROFESSOR ASSISTANT_PROFESSOR]}).includes(:course_groups)
# @courses = Course.includes(:course_groups).where(id: current_user.course_members, is_delete: 0) # @courses = Course.includes(:course_groups).where(id: current_user.course_members, is_delete: 0)
@ -756,6 +754,7 @@ class CoursesController < ApplicationController
@students = @students.where(course_group_id: course_group_id) @students = @students.where(course_group_id: course_group_id)
end end
@students = @students.includes(user: [user_extension: :school])
@students_count = @students.size @students_count = @students.size
end end

@ -2,8 +2,8 @@ json.students do
json.array! @students do |student| json.array! @students do |student|
json.user_id student.user_id json.user_id student.user_id
json.name student.user.real_name json.name student.user.real_name
json.student_id student.user.user_extension.try(:student_id) json.student_id student.user.student_id
json.school_name student.user.user_extension.school.try(:name) json.school_name student.user.school_name
end end
end end
json.students_count @students_count json.students_count @students_count
Loading…
Cancel
Save