Merge branch 'web_sannong_fr'

app/JsonRpc/WebsiteService.php

@@ -468,10 +468,24 @@ class WebsiteService implements WebsiteServiceInterface
         $where = [
             'website_id'=>$data['website_id']
         ];
-        $result = WebsiteCategory::where($where)->orderBy('sort', 'asc')->get();
-        if (empty($result)) {
-            return Result::error("查询站点栏目失败", 0);
-        } else {
+        // 使用递归查询构建树状结构
+        $category = WebsiteCategory::where($where)
+            ->with([
+                'children' => function ($query) {
+                    $query->orderBy('sort', 'asc');
+                }
+            ])
+            ->orderBy('sort', 'asc')
+            ->where('pid', 0) // 仅查询顶级节点
+            ->get()->all();
+        if(empty($category)){
+            return Result::error("查询站点栏目失败",0);
+        }else{
+            $count = WebsiteCategory::where($where)->count();
+            $result = [
+                'rep' => $category,
+                'count' => $count
+            ];
             return Result::success($result);
         }
     }
@@ -1491,7 +1505,7 @@ class WebsiteService implements WebsiteServiceInterface
             if (empty($website)) {
                 return Result::error("暂无该网站", 0);
             }
-            $result = WebsiteCategory::where('website_id', $data['website_id'])->where('category_id', $data['category_id'])->select('category_id', 'name')->first();
+            $result = WebsiteCategory::where('website_id',$data['website_id'])->where('category_id',$data['category_id'])->select('category_id','alias')->first();
             // return Result::success($category);
             if (empty($result)) {
                 return Result::error("暂无此导航", 0);