Merge branch 'web_sannong_fr'

app/Controller/WebController.php

@@ -1359,26 +1359,28 @@ class WebController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'level' =>'nullable|integer',
-                'category_id' =>'nullable|integer',
-                'imgnum' =>'required|integer',
-                'page' => 'required|integer',
-                'pageSize' =>'required|integer',
+                'level' => 'nullable|integer',
+                'category_id' => 'nullable|integer',
+                'imgnum' => 'required|integer',
+                'textnum' => 'required|integer',
+                // 自定义验证规则，确保 level 和 category_id 只有一个能为空
+                'level_or_category_id' => 'required_without_all:level,category_id|in:1',
             ],
             [
-                'level.required' => '推荐等级不能为空',
                 'level.integer' => '推荐等级必须为整数',
-                'page.required' => '当前页不能为空',
-                'page.integer' => '当前页必须为整数',
-                'pageSize.required' => '每页数量不能为空',
-                'pageSize.integer' => '每页数量必须为整数',
+                'category_id.integer' => '栏目 ID 必须为整数',
+                'imgnum.required' => '图片新闻条数不能为空',
+                'imgnum.integer' => '图片新闻条数必须为整数',
+                'textnum.required' => '文字新闻条数不能为空',
+                'textnum.integer' => '文字新闻条数必须为整数',
+                'level_or_category_id.required_without_all' => '推荐等级和栏目 ID 不能同时为空',
             ]
         );
         if ($validator->fails()){
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] =  Context::get("UserId")?? 0;
+        $requireData['website_id'] =  Context::get("SiteId")?? 0;
         $result = $this->newsServiceClient->getWebsiteCompany($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -1391,17 +1393,21 @@ class WebController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'level' =>'required|integer',
+                'keyword' =>'nullable|string',
+                'category_id' =>'nullable|integer',
                 'page' => 'required|integer',
                 'pageSize' =>'required|integer',
+                // 自定义验证规则，确保 level 和 category_id 只有一个能为空
+                'keyword_or_category_id' => 'required_without_all:keyword,category_id|in:1',
             ],
             [
-                'level.required' => '推荐等级不能为空',
-                'level.integer' => '推荐等级必须为整数',
+                'category_id.interger' => '栏目id必须为整数',   
+                'keyword.string' => '搜索关键字必须为字符串',
                 'page.required' => '当前页不能为空',
                 'page.integer' => '当前页必须为整数',
                 'pageSize.required' => '每页数量不能为空',
                 'pageSize.integer' => '每页数量必须为整数',
+                'keyword_or_category_id.required_without_all' => '搜索关键字和栏目 ID 不能同时为空',
             ]
         );
         if ($validator->fails()){
@@ -1421,11 +1427,11 @@ class WebController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'company_id' =>'required|integer',
+                'id' =>'required|integer',
             ],
             [
-                'company_id.required' => 'company_id不能为空',
-                'company_id.integer' => 'company_id必须为整数',
+                'id.required' => 'company_id不能为空',
+                'id.integer' => 'company_id必须为整数',
             ]
         );
         if ($validator->fails()){