Merge branch 'master' of http://59.57.98.130:3000/jjhc/jucai

app/Admin/Controllers/Company/CompanyController.php

@@ -221,6 +221,8 @@ class CompanyController extends Controller
             $query->where('subsite_id', get_subsite_id());
         })->when(Admin::user()->isRole('health'), function ($query) {
             $query->where('is_health',1);
+        })->when(Admin::user()->isRole('ic_group'), function ($query) {
+            $query->where('is_ic',1);
         })->orderByRaw("field(audit,2,1,3,0)")->orderBy('id', 'desc');
 
         $grid->id('ID');

app/Admin/Controllers/Company/JobsController.php

@@ -166,6 +166,8 @@ ETO;
             $query->where('subsite_id', get_subsite_id());
         })->when(Admin::user()->isRole('health'), function ($query) {
             $query->where('is_health',1);
+        })->when(Admin::user()->isRole('ic_group'), function ($query) {
+            $query->where('is_ic',1);
         })->orderByRaw("field(audit,2,1,3,0)")->orderBy('id', 'desc');
 
         $grid->id('id');

app/Admin/Controllers/Content/ArticleController.php

@@ -10,7 +10,7 @@ use App\Models\ArticleProperty;
 use App\Models\Subsite;
 use App\Models\SubsiteArticle;
 use Encore\Admin\Controllers\HasResourceActions;
-use Encore\Admin\Facades\Admin as userAdmin;
+use Encore\Admin\Facades\Admin;
 use Encore\Admin\Form;
 use Encore\Admin\Grid;
 use Encore\Admin\Layout\Content;
@@ -92,6 +92,10 @@ class ArticleController extends Controller
 
         $grid->model()->when(get_subsite_id()>0, function ($query) {
             $query->where('subsite_id', get_subsite_id());
+        })->when(Admin::user()->isRole('health'), function ($query) {
+            $query->whereIn('type_id',[65,66]);
+        })->when(Admin::user()->isRole('ic_group'), function ($query) {
+            $query->where('type_id',67);
         })->orderBy('list_order', 'DESC')->orderBy('created_at', 'DESC');
 
         $grid->column('新闻标题')->display(function () {
@@ -138,11 +142,11 @@ class ArticleController extends Controller
         $grid->click('点击量');
         $grid->created_at('添加时间');
         //新增按钮
-        if (userAdmin::user()->can('content_article_list_create')) {
+        if (Admin::user()->can('content_article_list_create')) {
             $grid->disableCreateButton(false);
         }
         //批量删除
-        if (userAdmin::user()->can('content_article_list_delete')) {
+        if (Admin::user()->can('content_article_list_delete')) {
             $grid->tools(function ($tools) {
                 $tools->batch(function ($batch) {
                     $batch->disableDelete(false);
@@ -153,12 +157,12 @@ class ArticleController extends Controller
         }
 
         $grid->actions(function ($actions) {
-            if (userAdmin::user()->can('content_article_list_delete')) {
+            if (Admin::user()->can('content_article_list_delete')) {
                 if ($actions->row['subsite_id']== get_subsite_id() || get_subsite_id()==0) {
                     $actions->disableEdit(false);
                 }
             }
-            if (userAdmin::user()->can('content_article_list_edit')) {
+            if (Admin::user()->can('content_article_list_edit')) {
                 if ($actions->row['subsite_id']== get_subsite_id() || get_subsite_id()==0) {
                     $actions->disableDelete(false);
                 }
@@ -325,6 +329,12 @@ class ArticleController extends Controller
 
         //$cate_option = ArticleCategory::selectOptions();
         $cate_option = ArticleCategory::selectOptions(function ($query) {
+            if(Admin::user()->isRole('health')){
+                return $query->whereIn('id',[65,66])->orderBy('list_order', 'desc')->orderBy('created_at', 'desc');
+            }
+            if(Admin::user()->isRole('ic_group')){
+                return $query->whereIn('id',[67])->orderBy('list_order', 'desc')->orderBy('created_at', 'desc');
+            }
             return $query->orderBy('list_order', 'desc')->orderBy('created_at', 'desc');
         });
         unset($cate_option[0]);

app/Admin/Controllers/Health/IndexController.php

@@ -372,7 +372,7 @@ class IndexController extends Controller
     }
 
     public function postStatus(Request $request){
-
+        Permission::check('postInfoList');
         $info = PostAppoint::where(['id' => $request->id])->first();
         if($info){
             $info->status = 1;

app/Admin/Controllers/Recruit/RecruitController.php

@@ -2827,7 +2827,7 @@ class RecruitController extends Controller
                 $data[$place] = [];
             }
 
-            $room = $v->ex_room == null ? 'empty' : $v->ex_room;
+            $room = $v->ex_room == null ? '' : $v->ex_room;
             if(!array_key_exists($room,$data[$place])){
                 $data[$place][$room] = [];
             }

app/Admin/Controllers/Recruit/SpecialController.php

@@ -840,7 +840,7 @@ class SpecialController extends Controller
             ->join('recruit_post', 'recruit_appoint_info.post_id', '=', 'recruit_post.id', 'left')
             ->join('recruit_appoint_expand_special', 'recruit_appoint_info.id', '=', 'recruit_appoint_expand_special.recruit_appoint_id', 'left')
             ->join('recruit_appoint_detail', 'recruit_appoint_detail.recruit_appoint_id', '=', 'recruit_appoint_info.id', 'left')
-            ->select('recruit_appoint_info.*', 'recruit_post.name', 'recruit_post.code', 'recruit_appoint_detail.train', 'recruit_appoint_detail.rewards_and_punishments', 'recruit_appoint_detail.introduce', 'recruit_appoint_expand_special.point_apply', 'recruit_appoint_expand_special.condition', 'recruit_appoint_expand_special.material')
+            ->select('recruit_appoint_info.*', 'recruit_post.name', 'recruit_post.code', 'recruit_appoint_detail.train', 'recruit_appoint_detail.rewards_and_punishments', 'recruit_appoint_detail.introduce', 'recruit_appoint_expand_special.point_apply', 'recruit_appoint_expand_special.condition', 'recruit_appoint_expand_special.material', 'recruit_appoint_expand_special.point')
             ->first();
         $recruit = Recruit::where('id',$data->recruit_id)->first();
         $recruit->forms = explode(',', $recruit->forms);
@@ -1719,12 +1719,12 @@ class SpecialController extends Controller
             ->get();
         $data = [];
         foreach ($list as $k => $v){
-            $place = $v->ex_place == null ? 'empty' : $v->ex_place;
+            $place = $v->ex_place == null ? '' : $v->ex_place;
             if(!array_key_exists($place,$data)){
                 $data[$place] = [];
             }
 
-            $room = $v->ex_room == null ? 'empty' : $v->ex_room;
+            $room = $v->ex_room == null ? '' : $v->ex_room;
             if(!array_key_exists($room,$data[$place])){
                 $data[$place][$room] = [];
             }

public/themes/default/views/app/recruit/show.blade.php

@@ -82,7 +82,7 @@
                         <li style="background:#bc3fbb;float: left;margin-bottom:10px;">面试通知书打印</li>
                     </a>
                 @endif
-                @if(in_array(6,explode(',',$recruit->step)))
+                @if(in_array(6,explode(',',$recruit->step)) && $recruit->reexamine_ticket_type == 1)
                     <a href="javascript:void(0)" id="reexamine_ticket" data-id="{{$info->id}}" >
                         <li style="background:#eb0b50;float: left;margin-bottom:10px;">复试通知书打印</li>
                     </a>