pc-前端-搜索二级导航

app/Controller/WebController.php

@@ -371,7 +371,7 @@ class WebController extends AbstractController
     /**
      * 获取文章列表
      */
-    public function getWebsiteArticlesList()
+    public function getWebsiteArticleList()
     {
        
         $requireData = $this->request->all();
@@ -387,34 +387,8 @@ class WebController extends AbstractController
             ]
             );
             $data['catid'] =  $requireData['catid']; 
-        }elseif(isset($requireData['keyword'])){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'keyword' => 'required'
-                ],
-                [
-                    'keyword.required' => '搜索词不能为空'
-    
-                ]
-            );
-            $data['keyword'] =  $requireData['keyword']; 
-        }else{
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'catid' => 'required',
-                    'keyword' => 'required'
-                ],
-                [
-                    'catid.required' => '栏目id不能为空',
-                    'keyword.required' => '搜索词不能为空'
-    
-                ]
-            );
-            $data['catid'] =  $requireData['catid']; 
-            $data['keyword'] =  $requireData['keyword']; 
         }
+            
         $validator = $this->validationFactory->make(
                 $requireData,
                 [
@@ -431,6 +405,10 @@ class WebController extends AbstractController
                 $errorMessage = $validator->errors()->first();
                 return Result::error($errorMessage);
             }
+            $data['catid'] =  $requireData['catid']; 
+            if(isset($requireData['keyword']) && !empty($requireData['keyword'])){
+                $data['keyword'] =  $requireData['keyword'];
+            }
             $data['website_id'] = Context::get("SiteId");
             $data['pageSize'] = $requireData['pageSize']; 
             $data['page'] = $requireData['page']; 
@@ -576,4 +554,39 @@ class WebController extends AbstractController
             return Result::success($result['data']);
         }
     }
+    /**
+     * 搜索二级导航
+     * @return array
+     */
+    public function selectWebsiteCategory()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'pid' =>'required|integer',
+                'cityid' => 'nullable|numeric',
+                'department_id' => 'nullable|numeric',
+            ], 
+            [
+                'pid.required' => 'id不能为空',
+                'pid.integer' => 'id必须为整数',
+                'cityid.numeric' => '城市id必须为数字',
+                'department_id.numeric' => '部门id必须为数字' 
+            ]
+        ) ;
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = $requireData;
+        $data['website_id'] = Context::get("SiteId");
+        $result = $this->websiteServiceClient->selectWebsiteCategory($data);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]); 
+        }else{
+            return Result::success($result['data']);
+         }
+
+    }
 }

app/JsonRpc/WebsiteService.php

@@ -484,7 +484,14 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
-
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function selectWebsiteCategory(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
     /**
      * @param array $data
      * @return array|mixed

app/JsonRpc/WebsiteServiceInterface.php

@@ -414,5 +414,10 @@ interface WebsiteServiceInterface
      * @return mixed
      */
     public function getWebsiteFooterCategoryInfo(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function selectWebsiteCategory(array $data);
 }
 

config/api/web.php

@@ -15,7 +15,7 @@ Router::addGroup(
                 Router::get('/getWebsiteArticlett', [WebController::class, 'getWebsiteArticlett']);
                 Router::get('/getWebsiteModelArticles', [WebController::class, 'getWebsiteModelArticles']);
                 Router::get('/getWebsiteModelCategory', [WebController::class, 'getWebsiteModelCategory']);
-                Router::get('/getWebsiteArticlesList', [WebController::class, 'getWebsiteArticlesList']);
+                Router::get('/getWebsiteArticleList', [WebController::class, 'getWebsiteArticleList']);
                 Router::get('/selectWebsiteArticleInfo', [WebController::class, 'selectWebsiteArticleInfo']);
 
                 Router::get('/selectWebsiteLinks', [WebController::class, 'selectWebsiteLinks']);
@@ -27,6 +27,8 @@ Router::addGroup(
                 Router::get('/getWebsiteFooterCategoryList', [WebController::class, 'getWebsiteFooterCategoryList']);
                 // 获取网站底部导航内容
                 Router::get('/getWebsiteFooterCategoryInfo', [WebController::class, 'getWebsiteFooterCategoryInfo']);
+                // 搜索网站二级导航
+                Router::get('/selectWebsiteCategory', [WebController::class, 'selectWebsiteCategory']);
             },
     ['middleware' => [WebMiddleware::class]]
 );