更新套餐权限

app/Admin/Controllers/Company/MembersSetmealController.php

@@ -141,9 +141,16 @@ class MembersSetmealController extends Controller
     {
         Permission::check('setmeal_manager_companysetmeal_index');
         $grid = new Grid(new MembersSetmeal);
+
         $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);
+                }
             });
         })->orderBy('id', 'desc');
         $grid->setmeal_name('套餐名称');
@@ -158,13 +165,6 @@ class MembersSetmealController extends Controller
             }
             return "永久";
         });
-        $grid->model()->when(get_subsite_id() > 0, function ($query) {
-            $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->actions(function ($actions) {
             if (Admin::user()->can('setmeal_manager_index_edit')) {