diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 7e150c44c..c303c7e78 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -17,25 +17,27 @@ 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 || nil
-    @attachments = @course.attachments.by_keywords(params[:search])
+    @attachments = @course.attachments.by_course_second_category_id(course_second_category_id)
                        .includes(attachment_group_settings: :course_group, author: [:user_extension, :course_members])
-                       .by_course_second_category_id(course_second_category_id)
                        .ordered(sort: sort.to_i, sort_type: sort_type.strip)
     get_category(@course, course_second_category_id)
 
-    case @user.course_identity(@course)
-    when 5
-      # 课程学生
-      @attachments = @attachments.published
-    when 6 || 7
-      # 非课堂成员
-      @attachments = @attachments.publiced.published
-    end
+    @attachments =
+      case @user.course_identity(@course)
+      when 5
+        @attachments.published
+      when 6, 7
+        @attachments.publiced.published
+      else
+        @attachments
+      end
 
     @total_count = @attachments.size
     @public_count = @attachments.publiced.size
     @private_count = @total_count - @public_count
 
+    @attachments = @attachments.by_keywords(params[:search])
+
     @attachments = @attachments.page(@page).per(@page_size)
   end