Merge remote-tracking branch 'origin/master'

app/Http/Controllers/Api/Soldier/JobController.php

@@ -60,9 +60,12 @@ class JobController extends ApiBaseController
 
         $category          = array_merge($category, $tag);
         $contact_list      = JobsContact::select('job_id', 'contact', 'telephone', 'email', 'address')->whereIn('job_id', $ids)->get()->keyBy('job_id')->toArray();
+        $company_list      = Company::select('id', 'district_cn', 'address', 'map_x', 'map_y', 'nature')->whereIn('id', $company_ids)->get()->keyBy('id')->toArray();
+        $nature_ids        = array_column($company_list, 'nature');
+        $category          = array_merge($category, $nature_ids);
         $category_list     = Category::whereIn('id', array_unique($category))->pluck('demand', 'id')->toArray();
         $category_job_list = CategoryJobs::whereIn('id', array_unique($category_job))->pluck('name', 'id')->toArray();
-        $company_list      = Company::select('id', 'district_cn', 'address', 'map_x', 'map_y')->whereIn('id', $company_ids)->get()->keyBy('id')->toArray();
+
 
         foreach ($list as $k => $v) {
             $list[$k]['contact_name']      = $contact_list[$v['id']]['contact'];
@@ -75,6 +78,7 @@ class JobController extends ApiBaseController
             $list[$k]['subclass']          = empty($category_job_list[$v['subclass']]) ? '' : $category_job_list[$v['subclass']];
             $list[$k]['trade']             = empty($category_list[$v['trade']]) ? '' : $category_list[$v['trade']];
             $list[$k]['scale']             = empty($category_list[$v['scale']]) ? '' : $category_list[$v['scale']];
+            $list[$k]['company_nature']    = empty($category_list[$company_list[$v['company_id']]['nature']]) ? '' : $category_list[$company_list[$v['company_id']]['nature']];
             $list[$k]['company_district']  = $company_list[$v['company_id']]['district_cn'];
             $list[$k]['company_address']   = $company_list[$v['company_id']]['address'];
             $list[$k]['company_map_x']     = $company_list[$v['company_id']]['map_x'];
@@ -94,4 +98,14 @@ class JobController extends ApiBaseController
         return response()->json($list);
     }
 
+    public function getCategory(Request $request)
+    {
+        $type = $request->input('type', '');
+        $list = [];
+        if (!empty($type)) {
+            $list = Category::where('alias', $type)->select(['id', 'demand'])->get()->toArray();
+        }
+
+        return response()->json($list);
+    }
 }

routes/api.php

@@ -139,4 +139,5 @@ Route::group([
     'prefix' => '/soldier'
 ], function (Router $router) {
     $router->post('job/getSoldierJobList', 'Api\Soldier\JobController@getSoldierJobList')->name('api.soldier.job.get_soldier_job_list');
+    $router->post('job/getCategory', 'Api\Soldier\JobController@getCategory')->name('api.soldier.job.get_category');
 });