Merge branch 'web_sannong_fr'

app/JsonRpc/NewsService.php

@@ -2724,9 +2724,9 @@ class NewsService implements NewsServiceInterface
                     $q->WhereRaw("JSON_CONTAINS(job_recruiting.city_arr_id, '" . intval($data['city_id']) . "') = 1");
                 });
             })
-            ->when(isset($data['catid_id']) && !empty($data['catid_id']), function ($query) use ($data) {
-                $query->where(function ($q) use ($data) {
-                    $q->WhereRaw("JSON_CONTAINS(job_recruiting.cat_arr_id, '" . intval($data['catid_id']) . "') = 1");
+            ->when(isset($data['catid']) &&!empty($data['catid']), function ($query) use ($data) {
+                $query->where(function($q) use ($data) {
+                    $q->WhereRaw("JSON_CONTAINS(job_recruiting.cat_arr_id, '". intval($data['catid']). "') = 1");
                 });
             })
             ->leftJoin('job_company', 'job_recruiting.id', '=', 'job_company.job_id')