修改搜索及获取新闻列表接口

app/Controller/WebController.php

@@ -379,19 +379,7 @@ class WebController extends AbstractController
     {
        
         $requireData = $this->request->all();
-        if(isset($requireData['catid'])){
-            $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'catid' => 'required'
-            ],
-            [
-                'catid.required' => '栏目id不能为空'
-
-            ]
-            );
-            $data['catid'] =  $requireData['catid']; 
-        }
+        
             
         $validator = $this->validationFactory->make(
                 $requireData,
@@ -405,14 +393,30 @@ class WebController extends AbstractController
     
                 ]
             );
+           
+            if(isset($requireData['keyword']) && !empty($requireData['keyword'])){
+                $data['keyword'] =  $requireData['keyword'];
+            }else{
+                $validator = $this->validationFactory->make(
+                    $requireData,
+                    [
+                        'catid' => 'required'
+                    ],
+                    [
+                        'catid.required' => '栏目id不能为空'
+        
+                    ]
+                    );
+                    $data['catid'] =  $requireData['catid']; 
+            }
+            if(isset($requireData['catid']) &&!empty($requireData['catid'])){
+                $data['catid'] =  $requireData['catid']; 
+            }
             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'];