Merge branch 'web_sannong_fr'

app/Controller/WebController.php

@@ -1387,7 +1387,7 @@ class WebController extends AbstractController
                 'page' => 'required|integer',
                 'pageSize' =>'required|integer',
                 // 自定义验证规则，确保 level 和 category_id 只有一个能为空
-                'keyword_or_category_id' => 'required_without_all:keyword,category_id|in:1',
+                // 'keyword_or_category_id' => 'required_without_all:keyword,category_id|in:1',
             ],
             [
                 'category_id.interger' => '栏目id必须为整数',   
@@ -1396,7 +1396,7 @@ class WebController extends AbstractController
                 'page.integer' => '当前页必须为整数',
                 'pageSize.required' => '每页数量不能为空',
                 'pageSize.integer' => '每页数量必须为整数',
-                'keyword_or_category_id.required_without_all' => '搜索关键字和栏目 ID 不能同时为空',
+                // 'keyword_or_category_id.required_without_all' => '搜索关键字和栏目 ID 不能同时为空',
             ]
         );
         if ($validator->fails()){
@@ -1466,7 +1466,7 @@ class WebController extends AbstractController
                 'category_id' =>'nullable|integer',
                 'page' => 'required|integer',
                 'pageSize' =>'required|integer',
-                'keyword_or_category_id' => 'required_without_all:keyword,category_id|in:1',
+                // 'keyword_or_category_id' => 'required_without_all:keyword,category_id|in:1',
             ],
             [
                 'category_id.interger' => '栏目id必须为整数',   
@@ -1475,7 +1475,7 @@ class WebController extends AbstractController
                 'page.integer' => '当前页必须为整数',
                 'pageSize.required' => '每页数量不能为空',
                 'pageSize.integer' => '每页数量必须为整数',
-                'keyword_or_category_id.required_without_all' => '搜索关键字和栏目 ID 不能同时为空',
+                // 'keyword_or_category_id.required_without_all' => '搜索关键字和栏目 ID 不能同时为空',
             ]
         );
         if ($validator->fails()){