Merge remote-tracking branch 'origin/master'

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

@@ -108,4 +108,11 @@ class JobController extends ApiBaseController
 
         return response()->json($list);
     }
+
+    public function getCompanyList(Request $request)
+    {
+        $page      = $request->input('page', 1);
+        $limit     = $request->input('limit', 10);
+        $update_at = $request->input('update_at', '');
+    }
 }

app/Http/Controllers/Mobile/Ic/IndexController.php

@@ -6,6 +6,7 @@ use App\Http\Controllers\Mobile\MobileBaseController;
 use App\Models\Article;
 use App\Models\Jobs;
 use App\Services\Company\JobsService;
+use Illuminate\Support\Facades\DB;
 
 class IndexController extends MobileBaseController
 {
@@ -15,33 +16,33 @@ class IndexController extends MobileBaseController
      * JobsController constructor.
      * @param $categoryService
      */
-    public function __construct( JobsService $jobsService)
+    public function __construct(JobsService $jobsService)
     {
-        $this->jobsService     = $jobsService;
+        $this->jobsService = $jobsService;
     }
 
     public function index()
     {
         //引才动态
-        $attract_list = Article::where('type_id',67)
-            ->where('is_display',1)
-            ->orderBy('list_order','desc')
-            ->orderBy('id','desc')
+        $attract_list = Article::where('type_id', 67)
+            ->where('is_display', 1)
+            ->orderBy('list_order', 'desc')
+            ->orderBy('id', 'desc')
             ->limit(5)
             ->get();
 
         //招聘列表
-        $size  = 10;
-        $list = Jobs::where('is_ic',1)->orderBy('updated_at', 'desc')->limit(5)->get();
+        $size = 10;
+        $list = Jobs::whereRaw('id in (select max(id) from jobs where is_ic = 1 and valid = 1 and audit = 1 and display = 1 GROUP BY company_id)')->limit(5)->get();
         if ($list->isEmpty()) {
             $recruit_list = [];
         } else {
             $recruit_list = $this->jobsService->dealjobFilelds($list);
         }
 
-        return view('mobile.app.ic.index',[
-            'attract_list'=>$attract_list,
-            'recruit_list'=>$recruit_list,
+        return view('mobile.app.ic.index', [
+            'attract_list' => $attract_list,
+            'recruit_list' => $recruit_list,
         ]);
     }
 

app/Http/Controllers/Mobile/Ic/RecruitController.php

@@ -31,15 +31,15 @@ class RecruitController extends MobileBaseController
     public function list(Request $request)
     {
         //获取分类
-        $filter_where   = [
+        $filter_where = [
             'AIX_education'  => 100,
             'AIX_experience' => 100,
             'AIX_wage'       => 100,
         ];
-        $categories     = $this->categoryService->getCategories($filter_where);     //过滤条件信息
+        $categories   = $this->categoryService->getCategories($filter_where);     //过滤条件信息
 
         //默认参数
-        $param_array = ['keyword', 'wage', 'experience','education'];
+        $param_array = ['keyword', 'wage', 'experience', 'education'];
         $params      = [];
         if ($request->all()) {
             foreach ($request->all() as $k => $v) {
@@ -50,9 +50,12 @@ class RecruitController extends MobileBaseController
         }
 
         //查询条件
-        $size    = 10;
-        $where   = [
+        $size  = 10;
+        $where = [
             ['is_ic', '=', 1],
+            ['valid', '=', 1],
+            ['audit', '=', 1],
+            ['display', '=', 1],
         ];
         if (!empty($params['keyword'])) {
             $where[] = ['jobs_name', 'like', '%' . $params['keyword'] . '%'];
@@ -109,19 +112,19 @@ class RecruitController extends MobileBaseController
 
     public function show(Request $request)
     {
-        $job_id = $request->input('id');
-        $job_rst = $this->jobsService->getJobInfo(array('id'=>$job_id));    //获取job信息
+        $job_id  = $request->input('id');
+        $job_rst = $this->jobsService->getJobInfo(['id' => $job_id]);    //获取job信息
         if ($job_rst['status'] == 0) {
             $back_url = \Illuminate\Support\Facades\URL::previous();
             return $this->showMessage($job_rst['error'], $back_url, true, '上一页', '3');
         }
         $job_info = $job_rst['job'];
 
-        $return_data = array(
-            'info'             => $job_info,
-        );
+        $return_data = [
+            'info' => $job_info,
+        ];
 
-        return view('mobile.app.ic.recruit.show',$return_data);
+        return view('mobile.app.ic.recruit.show', $return_data);
     }
 
     public function apply()