|
|
@@ -39,6 +39,17 @@ class UserController extends Controller
|
|
|
$query->where('name','like',$role);
|
|
|
});
|
|
|
}
|
|
|
+ if($request->has('owner_id')){
|
|
|
+ $owner_id= $request->input('owner_id');
|
|
|
+ $owner_ids = array_filter(preg_split('/[,, ]+/is',$owner_id));
|
|
|
+ $ids=[];
|
|
|
+ foreach ($owner_ids as $id)$ids[]='_'.$id;
|
|
|
+ $query->whereHas('roles',function($query) use ($ids){
|
|
|
+ $query->whereHas('authorities',function ($query)use($ids){
|
|
|
+ $query->whereIn('name',$ids);
|
|
|
+ });
|
|
|
+ });
|
|
|
+ }
|
|
|
$users = $query->orderBy('id','desc')->paginate($request->paginate ?? 50);
|
|
|
$users->each(function (User $user){
|
|
|
$user['isSuperAdmin']=$user->isSuperAdmin();
|