Merge branch 'web_sannong_fr' into dev

app/JsonRpc/WebsiteService.php

@@ -505,7 +505,10 @@ class WebsiteService implements WebsiteServiceInterface
             // ->whereBetween('ad.fromtime', [$now, 'ad.totime'])
             ->get()->all();
             if(empty($result)){
-               $result = AdPlace::where($where)->get()->all(); 
+               $result = AdPlace::where('website_id',$data['website_id'])
+               ->where('status',1)
+                ->where('ad_tag','like','%'.$data['ad_tag'].'%')
+                ->get()->all(); 
             }
             if(empty($result)){
                 return Result::error("此广告位不存在！",0);