Merge branch 'web_sannong_fr' into dev

app/Controller/WebController.php

@@ -100,24 +100,26 @@ class WebController extends AbstractController
     public function getWebsiteAdvertisement()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'adPlace' => 'required'
-            ],
-            [
-                'adPlace.required' => '广告位置编号不能为空'
-            ]
-        );
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
+        $data = ['website_id'=>Context::get("SiteId")]; 
+        if(isset($requireData['adPlace'])){
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'adPlace' => 'required'
+                ],
+                [
+                    'adPlace.required' => '广告位置编号不能为空'
+                ]
+            );
+            if ($validator->fails()){
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
+            $data['place_id'] = $requireData['adPlace'];
         }
-        $data = [
-            'website_id'=>Context::get("SiteId"),
-            'ad_placeid'=>$requireData['adPlace']
-        ]; 
         
+        
+        // return Result::success($data);//测试
         $result = $this->websiteServiceClient->getWebsiteAdvertisement($data);
 
         if ($result['code'] != ErrorCode::SUCCESS) {