Merge branch 'web_sannong_fr'

app/JsonRpc/NewsService.php

@@ -2780,31 +2780,23 @@ class NewsService implements NewsServiceInterface
         }
         if ((isset($data['type']) && $data['type'] == 1) || !isset($data['type'])) {
             $query = JobRecruiting::where('job_recruiting.status', 1)
-                ->where('job_recruiting.website_id', $data['website_id'])
-                ->where($where)
-                ->when(isset($data['city_id']) && !empty($data['city_id']), function ($query) use ($data) {
-                    $query->where(function ($q) use ($data) {
-                        $q->WhereRaw("JSON_CONTAINS(job_recruiting.city_arr_id, '" . intval($data['city_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')
-                ->select(
-                    'job_recruiting.id',
-                    'job_recruiting.hy_id',
-                    'job_recruiting.title',
-                    'job_recruiting.zw_id',
-                    'job_recruiting.jtzw_id',
-                    'job_recruiting.city_arr_id',
-                    'job_recruiting.due_data',
-                    'job_recruiting.cat_arr_id',
-                    'job_recruiting.updated_at'
-                )
-                ->orderBy('updated_at', 'desc');
+            ->where('job_recruiting.website_id', $data['website_id'])
+            ->where($where)
+            ->when(isset($data['city_id']) &&!empty($data['city_id']), function ($query) use ($data) {
+                $query->where(function($q) use ($data) {
+                    $q->WhereRaw("JSON_CONTAINS(job_recruiting.city_arr_id, '". intval($data['city_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')
+            ->select('job_recruiting.id','job_recruiting.hy_id','job_recruiting.title','job_recruiting.zw_id','job_recruiting.educational',
+            'job_recruiting.jtzw_id','job_recruiting.city_arr_id','job_recruiting.due_data','job_recruiting.experience',
+            'job_recruiting.cat_arr_id','job_recruiting.updated_at','job_company.business_name')
+            ->orderBy('updated_at', 'desc');
             $recruit_count = $query->count();
             $query = clone $query;
             $JobRecruiting = $query