调整

6 years ago · db3366aaed
parent 486ae178a3
commit db3366aaed
1 changed files with 2 additions and 1 deletions
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@ -995,7 +995,8 @@ class HomeworkCommonsController < ApplicationController
    else
      @subjects = @subjects[offset, limit]
      subject_ids = @subjects.pluck(:id)
-      @subjects = Subject.where(id: subject_ids).order("field(id,#{subject_ids.join(',')})").includes(:shixuns, user: [user_extension: :school])
+      order_ids = subject_ids.size > 0 ? subject_ids.join(',') : -1
+      @subjects = Subject.where(id: subject_ids).order("field(id,#{order_ids})").includes(:shixuns, user: [user_extension: :school])
    end
  end