修改自助建站-获取职能部门、获取行政区划参数验证

app/Controller/WebsiteController.php

@@ -1389,11 +1389,14 @@ class WebsiteController extends AbstractController
             [
                 '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']);
+         }
          $result = $this->websiteServiceClient->selectWebsiteDepartment($requireData);
          return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
 
@@ -1406,15 +1409,38 @@ class WebsiteController extends AbstractController
      public function selectWebsiteArea()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'website_id' =>'required',
+        $rules = [
+            'website_id' => 'required',
+            'province' => [
+                'nullable',
+                'numeric',
+                function ($attribute, $value, $fail) {
+                    if ($value === 0) {
+                        $fail($attribute . '不能为0');
+                    }
+                },
             ],
-            [
-                'website_id.required' => '网站id不能为空',
-            ]
-            );
+            'city' => [
+                'nullable',
+                'numeric',
+                function ($attribute, $value, $fail) {
+                    if ($value === 0) {
+                        $fail($attribute . '不能为0');
+                    }
+                },
+            ],
+        ];
+
+        $messages = [
+            'website_id.required' => '网站id不能为空',
+            'province.numeric' => '省份必须是数字类型',
+            'province.custom' => '省份不能为0',
+            'city.numeric' => '城市必须是数字类型',
+            'city.custom' => '城市不能为0',
+        ];
+
+        $validator = $this->validationFactory->make($requireData, $rules, $messages);
+       
         if ($validator->fails()){
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);