调整

app/controllers/application_controller.rb

@@ -68,7 +68,7 @@ class ApplicationController < ActionController::Base
 			# 手机类型的发送
 			sigle_para = {phone: value}
 			status = Educoder::Sms.send(mobile: value, code: code)
-			tip_exception(code_msg(status)) if status != 0
+			tip_exception(-2, code_msg(status)) if status != 0
 		when 8, 3, 5
 			# 邮箱类型的发送
 			sigle_para = {email: value}
@@ -77,7 +77,7 @@ class ApplicationController < ActionController::Base
 				# Mailer.run.email_register(code, value)
 			rescue Exception => e
 				logger_error(e)
-				tip_exception("邮件发送失败，请稍后重试")
+				tip_exception(-2,"邮件发送失败，请稍后重试")
 			end
 		end
 		ver_params = {code_type: send_type, code: code}.merge(sigle_para)

app/controllers/homework_commons_controller.rb

@@ -995,9 +995,11 @@ class HomeworkCommonsController < ApplicationController
       @subjects = @subjects.page(page).per(limit).includes(:shixuns, user: [user_extension: :school])
     else
       @subjects = @subjects[offset, limit]
-      subject_ids = @subjects.pluck(:id)
-      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])
+      unless @subjects.blank?
+        subject_ids = @subjects.pluck(:id)
+        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
   end