Merge branch 'collector_1106_fr'

app/JsonRpc/CollectorService.php

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