From d8c9163fa1dcb4367df40b2a09a064a32367037b Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 5 Sep 2019 16:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_banks_controller.rb       | 4 ++--
 app/services/users/question_bank_service.rb        | 2 +-
 app/views/users/question_banks/index.json.jbuilder | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/controllers/homework_banks_controller.rb b/app/controllers/homework_banks_controller.rb
index 7e10509ba..7bdf425bf 100644
--- a/app/controllers/homework_banks_controller.rb
+++ b/app/controllers/homework_banks_controller.rb
@@ -57,8 +57,8 @@ class HomeworkBanksController < ApplicationController
     tip_exception("description参数不能为空") if params[:homework_bank][:description].blank?
     if @bank.homework_type == 3
       tip_exception("base_on_project参数不能为空") if params[:homework_bank][:base_on_project].nil?
-      tip_exception("min_num参数不能为空") if params[:homework_bank][:min_num].blank?
-      tip_exception("max_num参数不能为空") if params[:homework_bank][:max_num].blank?
+      tip_exception("最小人数不能为空") if params[:homework_bank][:min_num].blank?
+      tip_exception("最大人数参数不能为空") if params[:homework_bank][:max_num].blank?
       tip_exception("最小人数不能小于1") if params[:homework_bank][:min_num].to_i < 1
       tip_exception("最大人数不能小于最小人数") if params[:homework_bank][:max_num].to_i < params[:homework_bank][:min_num].to_i
     end
diff --git a/app/services/users/question_bank_service.rb b/app/services/users/question_bank_service.rb
index 66dff2117..dbaa92e6e 100644
--- a/app/services/users/question_bank_service.rb
+++ b/app/services/users/question_bank_service.rb
@@ -85,7 +85,7 @@ class Users::QuestionBankService
   def custom_sort(relations, sort_by, sort_direction)
     case sort_by
     when 'updated_at' then
-      relations.order("updated_at #{sort_direction}, id desc")
+      relations.order("updated_at #{sort_direction}, id #{sort_direction}")
     when 'name' then
       relations.order("CONVERT(name USING gbk) COLLATE gbk_chinese_ci #{sort_direction}")
     when 'contributor' then
diff --git a/app/views/users/question_banks/index.json.jbuilder b/app/views/users/question_banks/index.json.jbuilder
index d5c580982..018e78254 100644
--- a/app/views/users/question_banks/index.json.jbuilder
+++ b/app/views/users/question_banks/index.json.jbuilder
@@ -1,6 +1,9 @@
 
 json.count @count
-json.course_list @course_lists, partial: 'users/question_banks/shared/course_list', as: :course_list
+json.course_list @course_lists do |course_list|
+  json.id course_list.id
+  json.name course_list.name
+end
 
 json.question_banks @question_banks do |question_bank|
   json.id question_bank.id