Merge branch 'web_sannong_fr'

app/Controller/WebController.php

@@ -329,6 +329,7 @@ class WebController extends AbstractController
     {
        
         $requireData = $this->request->all();
+        // return Result::success($requireData);
         if(isset($requireData['catid'])){
             $validator = $this->validationFactory->make(
             $requireData,
@@ -340,11 +341,6 @@ class WebController extends AbstractController
 
             ]
             );
-            if(is_string($requireData['catid'])){
-                $data['catid'] = json_decode($requireData['catid']); 
-            }else{
-                $data['catid'] = $requireData['catid']; 
-            }
         }
             
         $validator = $this->validationFactory->make(
@@ -363,16 +359,9 @@ 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']; 
-        // return Result::success($data);
-        $result = $this->newsServiceClient->getWebsiteArticleList($data);
+        $requireData['website_id'] = Context::get("SiteId");
+        $result = $this->newsServiceClient->getWebsiteArticleList($requireData);
         // var_dump($result);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
@@ -719,19 +708,6 @@ class WebController extends AbstractController
     public function getWebsiteParentCategory()
     {
         $requireData = $this->request->all();
-        // $validator = $this->validationFactory->make(
-        //     $requireData,
-        //     [
-        //         'id' =>'required|integer'
-        //     ], 
-        //     [
-        //         'id.required' => 'id不能为空'
-        //     ]
-        // ) ;
-        // if ($validator->fails()){
-        //     $errorMessage = $validator->errors()->first();
-        //     return Result::error($errorMessage);
-        // }
         $requireData['website_id'] =  Context::get("SiteId") ?? 0;
         $result = $this->websiteServiceClient->getWebsiteParentCategory($requireData);
         if ($result['code']!= ErrorCode::SUCCESS) {