From f05ed3b00dcdac0cb895cbddf256f2a18b16b3f8 Mon Sep 17 00:00:00 2001
From: zaoangod <zaoangod@qq.com>
Date: Tue, 6 Nov 2018 10:05:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AFjs?=
 =?UTF-8?q?=E5=9B=A0=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/admin/comments.html | 3 +++
 src/main/resources/templates/admin/index.html    | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/templates/admin/comments.html b/src/main/resources/templates/admin/comments.html
index 0b7c624c..dfbff820 100644
--- a/src/main/resources/templates/admin/comments.html
+++ b/src/main/resources/templates/admin/comments.html
@@ -110,6 +110,9 @@ <h3 class="panel-title">评论管理</h3>
                     },
                     success: function (data) {
                         $vm.commentPage = data.payload
+                        if(!data.payload.rows){
+                            $vm.commentPage.rows = []
+                        }
                     },
                     error: function (error) {
                         console.log(error);
diff --git a/src/main/resources/templates/admin/index.html b/src/main/resources/templates/admin/index.html
index baab756d..a284c884 100644
--- a/src/main/resources/templates/admin/index.html
+++ b/src/main/resources/templates/admin/index.html
@@ -160,7 +160,11 @@ <h4 class="panel-title">系统日志</h4>
                 tale.get({
                     url: '/admin/api/comments',
                     success: function (data) {
-                        $vm.comments = data.payload.rows
+                        if(!data.payload.rows){
+                            $vm.comments = [];
+                        }else{
+                            $vm.comments = data.payload.rows;
+                        }
                     },
                     error: function (error) {
                         console.log(error);

From b85a5b9b2e6c90bd61c538d92346dc353b1fb106 Mon Sep 17 00:00:00 2001
From: zaoangod <zaoangod@gmail.com>
Date: Tue, 13 Nov 2018 17:42:14 +0800
Subject: [PATCH 2/3] Update AdminApiController.java

---
 src/main/java/com/tale/controller/admin/AdminApiController.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/tale/controller/admin/AdminApiController.java b/src/main/java/com/tale/controller/admin/AdminApiController.java
index ce6c5929..0d06ff81 100644
--- a/src/main/java/com/tale/controller/admin/AdminApiController.java
+++ b/src/main/java/com/tale/controller/admin/AdminApiController.java
@@ -167,11 +167,13 @@ public RestResponse<?> updatePage(@BodyParam Contents contents) {
         return RestResponse.ok(cid);
     }
 
+    /*
     @GetRoute("categories")
     public RestResponse categories() {
         List<Metas> categories = metasService.getMetas(Types.CATEGORY);
         return RestResponse.ok(categories);
     }
+    */
 
     @SysLog("保存分类")
     @PostRoute("category/save")

From e0908a8fba1d7f4479b31d9e86ccb852ca96e7be Mon Sep 17 00:00:00 2001
From: zaoangod <zaoangod@gmail.com>
Date: Tue, 13 Nov 2018 17:43:02 +0800
Subject: [PATCH 3/3] Update AdminApiController.java

---
 .../com/tale/controller/admin/AdminApiController.java     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/main/java/com/tale/controller/admin/AdminApiController.java b/src/main/java/com/tale/controller/admin/AdminApiController.java
index 0d06ff81..011db7fd 100644
--- a/src/main/java/com/tale/controller/admin/AdminApiController.java
+++ b/src/main/java/com/tale/controller/admin/AdminApiController.java
@@ -167,14 +167,6 @@ public RestResponse<?> updatePage(@BodyParam Contents contents) {
         return RestResponse.ok(cid);
     }
 
-    /*
-    @GetRoute("categories")
-    public RestResponse categories() {
-        List<Metas> categories = metasService.getMetas(Types.CATEGORY);
-        return RestResponse.ok(categories);
-    }
-    */
-
     @SysLog("保存分类")
     @PostRoute("category/save")
     public RestResponse<?> saveCategory(@BodyParam MetaParam metaParam) {