From 29f451026c59f6021a71b8ec3edfbcb29a6588ae Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 10 Sep 2019 14:12:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E5=8D=87=E5=BA=8F=E5=92=8C=E9=99=8D=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index f6fae91db..d9ddcf2d1 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -708,6 +708,7 @@ class CoursesController < ApplicationController
   def students
     search = params[:search].present? ? params[:search].strip : nil
     order = params[:order].present? ? params[:order].to_i : 0
+    sort = params[:sort].present? ? params[:sort] : "desc"
     course_group_id = params[:course_group_id].present? ? params[:course_group_id].to_i : nil
 
     @students = CourseMember.students(@course)
@@ -719,12 +720,12 @@ class CoursesController < ApplicationController
 
     if order == 1
       # REDO:Extension
-      @students = @students.includes(user: :user_extension).order("user_extensions.student_id, users.login")
+      @students = @students.includes(user: :user_extension).order("user_extensions.student_id #{sort}, users.login #{sort}")
     elsif order == 2
-      @students = @students.includes(:course_group).order("course_groups.position, users.login")
+      @students = @students.includes(:course_group).order("course_groups.position #{sort}, users.login #{sort}")
     else
       # REDO:Extension
-      @students = @students.includes(user: :user_extension).order("user_extensions.student_id, users.login")
+      @students = @students.includes(user: :user_extension).order("user_extensions.student_id #{sort}, users.login #{sort}")
     end
 
     if course_group_id.present?