Merge branch 'web_sannong_fr'

app/JsonRpc/WebsiteService.php

@@ -2810,10 +2810,10 @@ class WebsiteService implements WebsiteServiceInterface
         if (empty($website)) {
             return Result::error("暂无该网站", 0);
         }
-        if (isset($data['pinyin']) && !empty($data['pinyin'])) {
-            $result = WebsiteCategory::where('website_id', $data['website_id'])
-                ->where('aLIas_pinyin', $data['pinyin'])
-                // $result = WebsiteCategory::where('category_id', $category_id)
+        if (isset($data['pinyin']) &&!empty($data['pinyin'])) {
+            $result = WebsiteCategory::where('website_id',$data['website_id'])
+            ->where('path',$data['pinyin'])
+            // $result = WebsiteCategory::where('category_id', $category_id)
                 // ->where('website_category.path', $data['pinyin'])
                 // ->leftJoin('website_category as pc', function ($join) use ($data) {
                 //     $join->on('pc.pid', '=', 'website_category.category_id')