From ce17cb1da0cdf381ef0f042cf674822421ed1bcb Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Jul 2015 15:13:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=EF=BC=8CTA?=
 =?UTF-8?q?=E7=9A=84=E8=AF=BE=E7=A8=8B=E6=98=BE=E7=A4=BA=E5=92=8C=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E6=95=B0=E9=87=8F=E3=80=81=E8=AF=BE=E7=A8=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d6597f3da..fa5ce8405 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -448,7 +448,7 @@ class UsersController < ApplicationController
 
   def user_courses4show
     query = Course.joins("join members m on #{Course.table_name}.id=m.course_id")
-    query = query.where("m.user_id = ?",@user.id)
+    query = query.where("m.user_id = ?",@user.id).order("#{Course.table_name}.id desc")
     if User.current == @user  #看自己
     else
       if @user.user_extensions!=nil && @user.user_extensions.identity == 0 #看老师
@@ -456,13 +456,12 @@ class UsersController < ApplicationController
         query = query.where("r.role_id in(3,7,9)")
       end
       query = query.where(Course.table_name+".is_public = 1")
-      # or exists (select 1 from courses c2,members m2 where c2.id=m2.course_id and c2.id=#{Course.table_name}.id and m2.user_id= User.current.id)
     end
 
     if params[:lastid]!=nil && !params[:lastid].empty?
-      query = query.where("( (#{Course.table_name}.updated_at=? and #{Course.table_name}.id < ?) or #{Course.table_name}.updated_at<?)",params[:lasttime],params[:lastid],params[:lasttime])
+      query = query.where(" #{Course.table_name}.id < ?",params[:lastid],)
     end
-    @list = query.order("#{Course.table_name}.updated_at desc,#{Course.table_name}.id desc").limit(8).all
+    @list = query.limit(8)
 
     render :layout=>nil
   end