资源模块的父目录显示子目录的资源

app/controllers/files_controller.rb

@@ -17,8 +17,8 @@ class FilesController < ApplicationController
     sort_type = params[:sort_type] || 'created_on' # created_on：时间排序， downloads：下载次数排序; quotes: 引用次数排序
     course_second_category_id = params[:course_second_category_id] || 0 # 0: 为主目录， 其他为次目录id
     @user = current_user
-    @attachments = @course.attachments.by_course_second_category_id(course_second_category_id)
-                       .includes(attachment_group_settings: :course_group, author: [:user_extension, :course_members])
+    @attachments = course_second_category_id.to_i == 0 ? @course.attachments : @course.attachments.by_course_second_category_id(course_second_category_id)
+    @attachments = @attachments.includes(attachment_group_settings: :course_group, author: [:user_extension, :course_members])
                        .ordered(sort: sort.to_i, sort_type: sort_type.strip)
 
     get_category(@course, course_second_category_id)

app/helpers/courses_helper.rb

@@ -194,7 +194,7 @@ module CoursesHelper
 
   # 获取课堂的资源数
   def get_attachment_count(course, category_id)
-    course.attachments.where(course_second_category_id: category_id).size
+    category_id.to_i == 0 ? course.attachments.size : course.attachments.where(course_second_category_id: category_id).size
   end
 
   # 获取课堂的作业数