|
@@ -93,8 +93,9 @@ class UserController extends Controller
|
|
|
$pageSize=$request->get('page_size') ?? 10;
|
|
$pageSize=$request->get('page_size') ?? 10;
|
|
|
$sort=$request->input('sort','desc');
|
|
$sort=$request->input('sort','desc');
|
|
|
//这里公共查询如超级管理员在邮件抄送时会看到其他公司用户不合适
|
|
//这里公共查询如超级管理员在邮件抄送时会看到其他公司用户不合适
|
|
|
|
|
+ $company_id = $request->input('company_id',Auth::user()->company_id);
|
|
|
$user=User::query()
|
|
$user=User::query()
|
|
|
- ->where('company_id',Auth::user()->company_id)
|
|
|
|
|
|
|
+ ->where('company_id',$company_id)
|
|
|
->filter($request->all())->orderBy('created_at',$sort)->paginate($pageSize);
|
|
->filter($request->all())->orderBy('created_at',$sort)->paginate($pageSize);
|
|
|
|
|
|
|
|
return UserSimpleResource::collection($user);
|
|
return UserSimpleResource::collection($user);
|
lsm12139