Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/subjects_controller.rb

@@ -160,14 +160,11 @@ class SubjectsController < ApplicationController
       @shixuns = @shixuns.where(id: shixun_ids)
     end
 
-    @shixuns = @shixuns.reorder("created_at desc")
+    @shixuns_count = @shixuns.count
-    @shixuns_count = @shixuns.size
 
     ## 分页参数
     page  = params[:page] || 1
-    @shixuns = @shixuns.page(page).per(10)
+    @shixuns = @shixuns.includes(:myshixuns).reorder("created_at desc").page(page).per(10)
-
-    @shixuns = @shixuns.includes(:myshixuns)
   end
 
   def append_to_stage