Merge branch 'web_sannong_fr' into dev

app/Controller/WebController.php

@@ -375,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,
@@ -389,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'];