|
|
@@ -33,8 +33,8 @@ class UserController extends Controller
|
|
|
$owners=app("OwnerService")->getIntersectPermitting();
|
|
|
$userDetailQuery = UserDetail::query()->select('user_id')->where('type','临时工');
|
|
|
$query = User::with(['roles','logistics','userWorkgroups','suppliers','userDetail'])->whereNotIn('id',$userDetailQuery);
|
|
|
- if($request->has('user')){
|
|
|
- $user=$request->input('user');
|
|
|
+ if($request->has('name')){
|
|
|
+ $user=$request->input('name');
|
|
|
$query->where('name','like',$user.'%');
|
|
|
}
|
|
|
if($request->has('role')){
|
|
|
@@ -49,8 +49,8 @@ class UserController extends Controller
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
- if($request->input('owner_id')){
|
|
|
- $owner_id= $request->input('owner_id');
|
|
|
+ if($request->input('owners')){
|
|
|
+ $owner_id= $request->input('owners');
|
|
|
$owner_ids = array_filter(preg_split('/[,, ]+/is',$owner_id));
|
|
|
$ownerIds=[];
|
|
|
foreach ($owner_ids as $id)$ownerIds[]='_'.$id;
|