diff --git a/app/Http/Controllers/Admin/RoleController.php b/app/Http/Controllers/Admin/RoleController.php index e8b4ad6..f0a71be 100644 --- a/app/Http/Controllers/Admin/RoleController.php +++ b/app/Http/Controllers/Admin/RoleController.php @@ -26,7 +26,7 @@ class RoleController extends Controller */ public function index() { - $model = Role::orderBy('description'); + $model = Role::where('name', '!=','developer')->orderBy('description'); QuerySupport::queryByKey($model, request(), 'name'); diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 6802ba4..2ae16ed 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -29,10 +29,9 @@ class UserController extends Controller */ public function index() { - $users = User::with([ - 'module:id,name', - 'roles:name' - ])->orderBy('name'); + $users = User::whereDoesntHave('roles', function ($query) { + $query->where('name', 'developer'); + })->orderBy('name'); QuerySupport::queryByKeys($users, ['name', 'email']);