diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index e69f00380..825e18a41 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -103,7 +103,10 @@ class CoursesController < ApplicationController def course_videos videos = @course.videos + @video_module = @course.course_modules.find_by(module_type: "video") if params[:category_id].present? && params[:category_id].to_i != 0 + @category = @video_module&.course_second_categories.find_by(id: params[:category_id]) + tip_exception("子目录id有误") if !@category.present? videos = videos.where(course_videos: {course_second_category_id: params[:category_id].to_i}) end diff --git a/app/views/courses/course_videos.json.jbuilder b/app/views/courses/course_videos.json.jbuilder index 807ff92bb..db4f4006c 100644 --- a/app/views/courses/course_videos.json.jbuilder +++ b/app/views/courses/course_videos.json.jbuilder @@ -1,3 +1,8 @@ json.count @count json.videos @videos, partial: 'users/videos/video', as: :video -json.course_id @course.id \ No newline at end of file +json.course_id @course.id +if @category.present? + json.category_id @category.id + json.category_name @category.name +end +json.course_module_id @video_module&.id \ No newline at end of file