From 5e632f42c3c4ae2fdbd1fd8189c052b1ff220709 Mon Sep 17 00:00:00 2001
From: Tom Liu <154212896@qq.com>
Date: Mon, 5 Nov 2018 13:42:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=92=8C=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E9=83=BD=E6=B2=A1=E6=9C=89=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E8=B7=B3=E8=BD=AC=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/http/controller/article.go |  8 ++++----
 src/http/controller/project.go | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/http/controller/article.go b/src/http/controller/article.go
index d0fc00b6..78531252 100644
--- a/src/http/controller/article.go
+++ b/src/http/controller/article.go
@@ -66,10 +66,10 @@ func (ArticleController) ReadList(ctx echo.Context) error {
 
 	num := len(articles)
 	if num == 0 {
-		if curPage == int(total) {
-			return render(ctx, "articles/list.html", map[string]interface{}{"articles": articles, "activeArticles": "active"})
-		}
-		return ctx.Redirect(http.StatusSeeOther, "/articles")
+		//if curPage == int(total) {
+		return render(ctx, "articles/list.html", map[string]interface{}{"articles": articles, "activeArticles": "active"})
+		//}
+		//return ctx.Redirect(http.StatusSeeOther, "/articles")
 	}
 
 	// 获取当前用户喜欢对象信息
diff --git a/src/http/controller/project.go b/src/http/controller/project.go
index 38d4f214..5143f9aa 100644
--- a/src/http/controller/project.go
+++ b/src/http/controller/project.go
@@ -54,11 +54,11 @@ func (ProjectController) ReadList(ctx echo.Context) error {
 
 	num := len(projects)
 	if num == 0 {
-		if curPage == int(total) {
-			return render(ctx, "projects/list.html", map[string]interface{}{"projects": projects, "activeProjects": "active"})
-		} else {
-			return ctx.Redirect(http.StatusSeeOther, "/projects")
-		}
+		//if curPage == int(total) {
+		return render(ctx, "projects/list.html", map[string]interface{}{"projects": projects, "activeProjects": "active"})
+		//} else {
+		//	return ctx.Redirect(http.StatusSeeOther, "/projects")
+		//}
 	}
 
 	// 获取当前用户喜欢对象信息