Merge branch 'web_sannong_fr'

app/JsonRpc/WebsiteService.php

@@ -736,7 +736,7 @@ class WebsiteService implements WebsiteServiceInterface
             ->when(!in_array(3,$website_column_arr) && $data['pid'] == 0, function ($query) use ($website_column_arr) {
                 $query->where('is_show', 1);
             })
-            ->when(in_array(3,$website_column_arr), function ($query) use ($data) {
+            ->when(in_array(3,$website_column_arr) ||  $data['pid'] != 0, function ($query) use ($data) {
                 $query->where('pid', $data['pid']);
             })
             ->offset($data['placeid'])