Merge branch 'collector_1106_fr'

app/JsonRpc/CollectorService.php

@@ -818,12 +818,17 @@ class CollectorService implements CollectorServiceInterface
                     }else{
                         //若不存在则返回所有导航栏目
                         $result = Category::select('id','name')->get();
+                        if(!empty($result->toArray())){
+                            return Result::success($result);
+                        }else{
+                            return Result::error('暂无数据');
+                        }
                     }
                 }
                 
             }
         }
-        if(empty($result->toArray())){
+        if(empty($result)){
             return Result::error('暂无数据');
         }else{
             return  Result::success($result);