修改根据职能部门及地区获取新闻

app/Controller/WebController.php

@@ -372,6 +372,7 @@ class WebController extends AbstractController
 
     /**
      * 获取文章列表
+     * @return array
      */
     public function getWebsiteArticleList()
     {
@@ -392,28 +393,28 @@ class WebController extends AbstractController
         }
             
         $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'page' => 'required',
-                    'pageSize' => 'required'
-                ],
-                [
-                    'page.required' => '分页不能为空',
-                    'pageSize.required' => '显示条数不能为空'
-    
-                ]
-            );
-            if ($validator->fails()){
-                $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']; 
+            $requireData,
+            [
+                'page' => 'required',
+                'pageSize' => 'required'
+            ],
+            [
+                'page.required' => '分页不能为空',
+                'pageSize.required' => '显示条数不能为空'
+
+            ]
+        );
+        if ($validator->fails()){
+            $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']; 
         $result = $this->newsServiceClient->getWebsiteArticleList($data);
         // var_dump($result);
         if ($result['code'] != ErrorCode::SUCCESS) {
@@ -557,7 +558,7 @@ class WebController extends AbstractController
         }
     }
     /**
-     * 搜索二级导航
+     * 搜索导航
      * @return array
      */
     public function selectWebsiteCategory()
@@ -566,13 +567,10 @@ class WebController extends AbstractController
         $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必须为数字' 
             ]
@@ -592,7 +590,7 @@ class WebController extends AbstractController
 
     }
     /**
-     * 搜索二级导航
+     * 搜索栏目的seo信息
      * @return array
      */
     public function getWebsiteCategoryHead()