From 0265b6bfb7696f3e58eec60d06d9bd43c5e3d4f1 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 13 Oct 2016 09:52:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=88=86=E9=A1=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/welcome_controller.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 3ac7eaf45..4cee2a47c 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -190,7 +190,7 @@ class WelcomeController < ApplicationController
 
     case params[:search_type]
       when 'all'
-        if (page-1)*20 > @total_count
+        if (page-1)*20 >= @total_count
           page = 1
           params[:page] = "1"
         end
@@ -220,42 +220,42 @@ class WelcomeController < ApplicationController
                                                          }
                                                      },[User,Syllabus,Course,Attachment,Project,Memo] ).page(page).per(20).results
       when 'user'
-            if (page-1)*20 > @users_count
+            if (page-1)*20 >= @users_count
               page = 1
               params[:page] = "1"
             end
             @users = User.search(@name).page(page).per(20)
       when 'syllabus'
-            if (page-1)*20 > @syllabus_count
+            if (page-1)*20 >= @syllabus_count
               page = 1
               params[:page] = "1"
             end
             @syllabuses = Syllabus.search(@name).page(page).per(20).results
       when 'project'
-            if (page-1)*20 > @project_count
+            if (page-1)*20 >= @project_count
               page = 1
             end
             @projects = Project.search(@name).page(page).per(20).results
       when 'course'
-            if (page-1)*20 > @course_count
+            if (page-1)*20 >= @course_count
               page = 1
               params[:page] = "1"
             end
             @courses = Course.search(@name).page(page).per(20).results
       when 'attachment'
-            if (page-1)*20 > @attach_count
+            if (page-1)*20 >= @attach_count
               page = 1
               params[:page] = "1"
             end
             @attachments = Attachment.search(@name).page(page).per(20).results
       when 'memo'
-            if (page-1)*20 > @memo_count
+            if (page-1)*20 >= @memo_count
               page = 1
               params[:page] = "1"
             end
             @memos = Memo.search(@name).page(page).per(20).results
       else
-              if (page-1)*20 > @total_count
+              if (page-1)*20 >= @total_count
                 page = 1
                 params[:page] = "1"
               end