From bdc43fb9ce99905d97fb01eaeb50dca66cf6eb0d Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Mon, 24 Jun 2019 14:29:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8E=86=E5=8F=B2=E8=AF=BE?= =?UTF-8?q?=E5=A0=82=E7=9A=84=E5=AD=A6=E7=94=9Fapi=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 6 ++++-- .../courses/get_historical_course_students.json.jbuilder | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 8de98f0cb..1bf81e87b 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -737,11 +737,13 @@ class CoursesController < ApplicationController end end - # 获取历史课堂，即用户管理的所有课堂以及课堂下的分班 + # 获取历史课堂，即用户管理的所有课堂以及课堂下的分班(去除当前课堂) def get_historical_courses user_id = current_user.id - @courses = Course.includes(:course_groups).where(tea_id: user_id, is_delete: 0) + @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) + # @courses = Course.includes(:course_groups).where(id: current_user.course_members, is_delete: 0) end # 根据历史课堂的课堂id和分班id获取所有学生 diff --git a/app/views/courses/get_historical_course_students.json.jbuilder b/app/views/courses/get_historical_course_students.json.jbuilder index a2d3a3f57..8dc4e22ce 100644 --- a/app/views/courses/get_historical_course_students.json.jbuilder +++ b/app/views/courses/get_historical_course_students.json.jbuilder @@ -1,6 +1,6 @@ json.students do json.array! @students do |student| - json.course_member_id student.id + json.user_id student.user_id json.name student.user.real_name json.student_id student.user.user_extension.try(:student_id) json.school_name student.user.user_extension.school.try(:name)