更改招考系统

app/Admin/Controllers/Company/MembersSetmealController.php

@@ -145,14 +145,18 @@ class MembersSetmealController extends Controller
         $grid->model()->where('utype', 1)->whereHas('companys')->when(get_subsite_id()>0, function ($querys) {
             $querys->whereHas('companys', function ($query) {
                 $query->where('subsite_id', get_subsite_id());
-                if(Admin::user()->isRole('health')){
-                    $query->where('is_health',1);
-                }
-                if(Admin::user()->isRole('ic_group')){
-                    $query->where('is_ic',1);
-                }
+            });
+        })->when(Admin::user()->isRole('health'), function ($querys) {
+            $querys->whereHas('companys', function ($query) {
+                $query->where('is_health',1);
+            });
+        })->when(Admin::user()->isRole('ic_group'), function ($querys) {
+            $querys->whereHas('companys', function ($query) {
+                $query->where('is_ic',1);
             });
         })->orderBy('id', 'desc');
+
+
         $grid->setmeal_name('套餐名称');
         $grid->column('companys.companyname', '公司名称');
         $grid->column('companys.username', '用户名称');

app/Admin/Controllers/Company/SetmealController.php

@@ -100,12 +100,6 @@ class SetmealController extends Controller
         $grid->days('期限')->display(function ($days) {
             return $days==0?"不限制":$days;
         });
-        $grid->model()->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');
-
         if (Admin::user()->can('setmeal_manager_category_add')) {
             $grid->disableCreateButton(false);
         }

app/Http/Controllers/Web/Recruit/IndexController.php

@@ -1726,7 +1726,7 @@ class IndexController extends WebBaseController
 //                        'title'       => "{$filename}.docx",
 //                        'url' => "https://www.jucai.gov.cn/storage/recruit/ticket/word/{$date}/{$name}/pen/{$filename}.docx",
 //                    ]);
-                    $file     = base_path() . "/storage/recruit/ticket/pdf/{$date}/{$name}/pen/" . $filename . '.pdf';
+                    $file     = base_path() . "/storage/app/public/recruit/ticket/pdf/{$date}/{$name}/pen/" . $filename . '.pdf';
 
                     if (file_exists($file)) {
                         header('Content-Description: File Transfer');