From 46ea08ea0a21e3c91449b7a423f0899a65eed143 Mon Sep 17 00:00:00 2001 From: liyinglin Date: Thu, 23 Nov 2023 14:27:02 +0800 Subject: [PATCH] 1 --- app/Http/Controllers/Admin/VisitController.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index 31f1d05..6cf3c6c 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -70,13 +70,14 @@ class VisitController extends CommonController }); } // 权限设置 -// $user = $this->getUser(); -// $adminIds = Admin::roleAllowAdminIds($user, $departmentIds); -// $query->where(function ($qry) use ($adminIds, $departmentIds, $user) { -// $qry->whereIn('accpet_department_id', $departmentIds)->orWhere(function ($qry) use ($adminIds) { -// $qry->whereIn('accept_admin_id', $adminIds); -// }); -// }); + $user = $this->getUser(); + $adminIds = Admin::roleAllowAdminIds($user, $departmentIds); + dd($adminIds,$departmentIds); + $query->where(function ($qry) use ($adminIds, $departmentIds, $user) { + $qry->whereIn('accpet_department_id', $departmentIds)->orWhere(function ($qry) use ($adminIds) { + $qry->whereIn('accept_admin_id', $adminIds); + }); + }); })->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc'); if (isset($all['is_export']) && !empty($all['is_export'])) { return (new FastExcel($list->limit(5000)->get()->toArray()))->download('访问记录' . date('YmdHis') . '.csv', function ($info) {