|
@@ -71,13 +71,13 @@ class UserController extends Controller
|
|
$sort=$request->input('sort','desc');
|
|
$sort=$request->input('sort','desc');
|
|
//超管能看到所有用户
|
|
//超管能看到所有用户
|
|
if(Auth::user()->super_admin){
|
|
if(Auth::user()->super_admin){
|
|
- $user = User::query()->filter($request->all())->orderBy('created_at',$sort)->paginate();
|
|
|
|
|
|
+ $user = User::query()->filter($request->all())->orderBy('created_at',$sort)->paginate(10);
|
|
return UserSimpleResource::collection($user);
|
|
return UserSimpleResource::collection($user);
|
|
}
|
|
}
|
|
//普通管理员能看到自己公司的用户
|
|
//普通管理员能看到自己公司的用户
|
|
$user=User::query()
|
|
$user=User::query()
|
|
->where('company_id',Auth::user()->company_id)
|
|
->where('company_id',Auth::user()->company_id)
|
|
- ->filter($request->all())->orderBy('created_at',$sort)->paginate();
|
|
|
|
|
|
+ ->filter($request->all())->orderBy('created_at',$sort)->paginate(10);
|
|
return UserSimpleResource::collection($user);
|
|
return UserSimpleResource::collection($user);
|
|
}
|
|
}
|
|
|
|
|