修改c端接口：获取招工招聘列表

app/JsonRpc/NewsService.php

@@ -2328,21 +2328,25 @@ private function fetchArticles($catId, $website, $limit, $isImageArticle = false
         }
         if((isset($data['type']) && $data['type'] == 2) || !isset($data['type'])){
             if(isset($data['zw_id']) && !empty($data['zw_id'])){
-                array_push($hunt_where, ['job',$data['zw_id']]);
+                array_push($hunt_where, ['job_hunting.job',$data['zw_id']]);
             }
             if(isset($data['jtzw_id']) &&!empty($data['jtzw_id'])){
-                array_push($hunt_where, ['job_name_get',$data['jtzw_id']]);
+                array_push($hunt_where, ['job_hunting.job_name_get',$data['jtzw_id']]);
             }
             if(isset($data['hy_id']) && !empty($data['hy_id'])){
-                array_push($hunt_where, ['industry',$data['hy_id']]);
+                array_push($hunt_where, ['job_hunting.industry',$data['hy_id']]);
             }
-            $query = JobHunting::where('status', 2)
+            if(isset($data['keyword']) && !empty($data['keyword'])){ 
+                array_push($hunt_where, ['job_position.zwname','like','%'.$data['keyword'].'%']); 
+
+            } 
+            $query = JobHunting::where('job_hunting.status', 2)
             ->where('job_hunting.website_id', $data['website_id'])
             ->leftJoin('job_position', 'job_hunting.job_name_get', '=', 'job_position.zwid')
             ->where($hunt_where) 
-            ->when(isset($data['keyword']) &&!empty($data['keyword']), function ($query) use ($data) { 
-                $query->where('job_position.zwname','like','%'.$data['keyword'].'%'); 
-            }) 
+            // ->when(isset($data['keyword']) &&!empty($data['keyword']), function ($query) use ($data) { 
+            //     $query->where('job_position.zwname','like','%'.$data['keyword'].'%'); 
+            // }) 
             ->when(isset($data['city_id']) &&!empty($data['city_id']), function ($query) use ($data) {
                 $query->where(function($q) use ($data) {
                     $q->WhereRaw("JSON_CONTAINS(job_hunting.city_arr_id, '". intval($data['city_id']). "') = 1");
@@ -2353,8 +2357,10 @@ private function fetchArticles($catId, $website, $limit, $isImageArticle = false
                     $q->WhereRaw("JSON_CONTAINS(job_hunting.cat_arr_id, '". intval($data['catid_id']). "') = 1");
                 });
             })
-            ->select('id','sexy','experience','origin','industry','name','job','job_name_get','city_arr_id','cat_arr_id','created_at','updated_at')
-            ->orderBy('updated_at', 'desc');
+            ->select('job_hunting.id','job_hunting.sexy','job_hunting.experience','job_hunting.origin','job_hunting.industry',
+            'job_hunting.name','job_hunting.job','job_hunting.job_name_get','job_hunting.city_arr_id','job_hunting.cat_arr_id',
+            'job_hunting.created_at','job_hunting.updated_at','job_position.zwname as job_name')
+            ->orderBy('job_hunting.updated_at', 'desc');
             $hunt_count = $query->count();
             $query = clone $query;
             $JobHunting = $query
@@ -3029,9 +3035,9 @@ private function fetchArticles($catId, $website, $limit, $isImageArticle = false
     {
         $categorys = json_decode($data['id'], true);
         if(!empty($categorys)){
-            $category_arr = $this->processArticlePro($data['website_id']);
-            $cat_1st_arr = $category_arr['cat_1st_arr'];
-            $catiall = $category_arr['catiall'];
+            // $category_arr = $this->processArticlePro($data['website_id']);
+            // $cat_1st_arr = $category_arr['cat_1st_arr'];
+            // $catiall = $category_arr['catiall'];
             // return Result::success($catiall);
             foreach($categorys as $key => $val){
                 if(isset($val['level'][0]) && !empty($val['level'][0])){
@@ -3114,23 +3120,23 @@ private function fetchArticles($catId, $website, $limit, $isImageArticle = false
                         ->get()->all();
                     }
                 }
-                if(!empty($img_num)){
-                    foreach ($img_num as $k => $v) {
-                        $img_num[$k]->category_name = $catiall[$v->category_id]['alias'];
-                        $imgurl = json_decode($v['imgs'], true);
-                        if(!empty($imgurl)){
-                            $img_num[$k]->imgurl = $imgurl[0];
-                        }
-                        $img_num[$k]->pinyin = $catiall[$v->category_id]['pinyin'];
+                // if(!empty($img_num)){
+                //     foreach ($img_num as $k => $v) {
+                //         $img_num[$k]->category_name = $catiall[$v->category_id]['alias'];
+                //         $imgurl = json_decode($v['imgs'], true);
+                //         if(!empty($imgurl)){
+                //             $img_num[$k]->imgurl = $imgurl[0];
+                //         }
+                //         $img_num[$k]->pinyin = $catiall[$v->category_id]['pinyin'];
 
-                    }
-                }
-                if(!empty($text_num)){
-                    foreach ($text_num as $k => $v) {
-                        $text_num[$k]->category_name = $catiall[$v->category_id]['alias'];
-                        $text_num[$k]->pinyin = $catiall[$v->category_id]['pinyin'];
-                    }
-                }
+                //     }
+                // }
+                // if(!empty($text_num)){
+                //     foreach ($text_num as $k => $v) {
+                //         $text_num[$k]->category_name = $catiall[$v->category_id]['alias'];
+                //         $text_num[$k]->pinyin = $catiall[$v->category_id]['pinyin'];
+                //     }
+                // }
                 $project[$key]['img_num'] = $img_num ?? [];
                 $project[$key]['text_num'] = $text_num ?? [];
             }