Merge pull request otale#485 from zaoangod/master

🎁修复前端js因数据为空报错
mulholland0318 · Nov 18, 2018 · 620770f · 620770f
2 parents a05bd68 + e0908a8
commit 620770f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/com/tale/controller/admin/AdminApiController.java b/src/main/java/com/tale/controller/admin/AdminApiController.java
@@ -167,12 +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) {

diff --git 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
@@ -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);