修改获取新闻列表的验证器

app/Controller/WebController.php

@@ -6,13 +6,12 @@ use App\JsonRpc\NewsServiceInterface;
 use App\JsonRpc\WebsiteServiceInterface;
 use App\Tools\PublicData;
 use Hyperf\Di\Annotation\Inject;
+use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use App\Constants\ErrorCode;
-use App\Controller\PublicController;
 use Hyperf\Context\Context;
-use Hyperf\HttpServer\Contract\RequestInterface;
-use Hyperf\HttpServer\Contract\ResponseInterface;
+
 /**
  * Class WebController
  * @package App\Controller
@@ -22,7 +21,7 @@ class WebController extends AbstractController
 
     #[Inject]
     protected ValidatorFactoryInterface $validationFactory;
-    private $publicServiceClient;
+
     /**
      * @var NewsServiceInterface
      */
@@ -37,7 +36,6 @@ class WebController extends AbstractController
 
 
     private $PublicController;
-
     public function __construct(PublicController $PublicController)
     {
         $this->PublicController = $PublicController;
@@ -66,10 +64,9 @@ class WebController extends AbstractController
         }
 
         $data = [
-            'website_id'=>Context::get("SiteId"),
-            'pageSize'=>$requireData['pageSize']
+            'website_id'=>Context::get("SiteId")
         ];
-        // var_dump("网站id：",Context::get("SiteId"));
+        var_dump("网站id：",Context::get("SiteId"));
         $result = $this->websiteServiceClient->getWebsiteCategory($data);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
@@ -153,7 +150,6 @@ class WebController extends AbstractController
         return Result::success($result['data']);
     }
 
-
     /**
      *各省市查询 
      */
@@ -379,7 +375,19 @@ 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,
@@ -393,30 +401,14 @@ 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'];