|
@@ -215,8 +215,12 @@ class CompanyController extends Controller
|
|
|
$query->whereHas("membersSetmeal", function ($query) {
|
|
|
$query->where('subsite_id', get_subsite_id());
|
|
|
});
|
|
|
+ })->orderByRaw("field(audit,2,1,3,0)")->orderBy('id', 'desc');
|
|
|
|
|
|
-
|
|
|
+ $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);
|
|
|
})->orderByRaw("field(audit,2,1,3,0)")->orderBy('id', 'desc');
|
|
|
|
|
|
$grid->id('ID');
|