Merge branch '20241216_fr_diyweb' into dev

app/Controller/WebsiteController.php

@@ -1106,37 +1106,6 @@ class WebsiteController extends AbstractController
  
     public function getWebsiteintel(){  //getWebsiteTemplateintel
         $requireData = $this->request->all();
-        if(isset($requireData['website_name'])){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'website_name' =>'required'
-                ],
-                [
-                    'website_name.required' => '网站名称不能为空'
-                ]
-            );
-            if ($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-        }
-        if(isset($requireData['status'])){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'status' =>'required'
-                ],
-                [
-                    'status.required' => '网站应用状态不能为空'
-                ]
-            );
-            if ($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-
-        }
         $validator = $this->validationFactory->make(
             $requireData,
             [
@@ -1417,7 +1386,7 @@ class WebsiteController extends AbstractController
                         'template_class_id' =>'required'
                     ],
                     [
-                        'template_class_id.required' => '模板分类id不能为空',
+                        'template_class_id.required' => '风格id不能为空',
                     ]
                 );
                 if ($validator->fails()){
@@ -1533,17 +1502,24 @@ class WebsiteController extends AbstractController
          $validator = $this->validationFactory->make(
              $requireData,
              [
-                 'website_id' =>'required'
+                 'website_id' =>'required',
+                 'page' =>'required',
+                 'pageSize' =>'required'
              ],
              [
-                 'website_id.required' => '网站id不能为空'
+                 'website_id.required' => '网站id不能为空',
+                 'page.required' => '第几页不能为空',
+                 'pageSize.required' => '每页显示条数不能为空'
              ]
          );
          if ($validator->fails()){
              $errorMessage = $validator->errors()->first();
              return Result::error($errorMessage);
          }
-         $result = $this->websiteServiceClient->getWebsiteTemplateclassintel($requireData);
+         $data = $requireData;
+        //  $templates = $this->websiteServiceClient->getWebsiteTemplateList($requireData);
+        //  $data['templates'] = array_merge($data['templates'] ?? [], $templates['data']['rows'] ?? []);
+         $result = $this->websiteServiceClient->getWebsiteTemplateclassintel($data);
          return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
         
      }