From 5e604ce8b1e9ddd4eae8c3f42c5f73a5ce6b3a81 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 24 Aug 2019 14:52:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=A6=E5=8F=B7=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index c8707d72e..e29fa8d7d 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -707,12 +707,12 @@ class CoursesController < ApplicationController
 
     if order == 1
       # REDO:Extension
-      @students = @students.includes(user: :user_extension).order("user_extensions.student_id, course_members.id")
+      @students = @students.includes(user: :user_extension).order("user_extensions.student_id, users.login")
     elsif order == 2
-      @students = @students.includes(:course_group).order("course_groups.position, course_members.id")
+      @students = @students.includes(:course_group).order("course_groups.position, users.login")
     else
       # REDO:Extension
-      @students = @students.includes(user: :user_extension).order("user_extensions.student_id, course_members.id")
+      @students = @students.includes(user: :user_extension).order("user_extensions.student_id, users.login")
     end
 
     if course_group_id.present?

From 0107a9b6fed2db36d6fb2ed96c29b4e71fc48a0c Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 24 Aug 2019 15:02:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/course_end.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/course_end.rake b/lib/tasks/course_end.rake
index d8e87eacf..841c30b27 100644
--- a/lib/tasks/course_end.rake
+++ b/lib/tasks/course_end.rake
@@ -2,7 +2,7 @@
 namespace :course do
   desc "course end"
   task :end => :environment do
-    courses = Course.where("end_date <= '#{Date.today}' and is_end = 0")
+    courses = Course.where("end_date < '#{Date.today}' and is_end = 0")
     courses.each do |course|
       course.update_attribute(:is_end, 1)
     end