Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

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?

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