修改验证获取职能部门、获取行政区划

app/Controller/WebsiteController.php

@@ -1535,21 +1535,23 @@ class WebsiteController extends AbstractController
 
      {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'website_id' =>'required',
-            ],
-            [
-                'website_id.required' => '网站id不能为空',
-            ]
-        );
-         if ($validator->fails()){
-             $errorMessage = $validator->errors()->first();
-             return Result::error($errorMessage); 
-         }
+        // $validator = $this->validationFactory->make(
+        //     $requireData,
+        //     [
+        //         'website_id' =>'required',
+        //     ],
+        //     [
+        //         'website_id.required' => '网站id不能为空',
+        //     ]
+        // );
+        //  if ($validator->fails()){
+        //      $errorMessage = $validator->errors()->first();
+        //      return Result::error($errorMessage); 
+        //  }
          if(isset($requireData['keyword']) && !empty($requireData['keyword'])){
             $requireData['keyword'] = trim($requireData['keyword']);
+         }else{
+            $requireData['keyword'] = '';
          }
          $result = $this->websiteServiceClient->selectWebsiteDepartment($requireData);
          return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
@@ -1564,7 +1566,7 @@ class WebsiteController extends AbstractController
     {
         $requireData = $this->request->all();
         $rules = [
-            'website_id' => 'required',
+            // 'website_id' => 'required',
             'province' => [
                 'nullable',
                 'numeric',
@@ -1586,7 +1588,7 @@ class WebsiteController extends AbstractController
         ];
 
         $messages = [
-            'website_id.required' => '网站id不能为空',
+            // 'website_id.required' => '网站id不能为空',
             'province.numeric' => '省份必须是数字类型',
             'province.custom' => '省份不能为0',
             'city.numeric' => '城市必须是数字类型',
@@ -1602,6 +1604,7 @@ class WebsiteController extends AbstractController
             $result = $this->websiteServiceClient->selectWebsiteArea($requireData);
             return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
 
+<<<<<<< HEAD
         }      
     /**
      * 获取底部导航
@@ -1663,5 +1666,7 @@ class WebsiteController extends AbstractController
         }
         $result = $this->websiteServiceClient->getFooterContentInfo($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+=======
+>>>>>>> 20241216_fr_diyweb
     }
 }