From 3dadcd25cbde977c1ebd4d711001ad823369a090 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Fri, 21 Mar 2025 13:48:45 +0800 Subject: [PATCH 1/6] update --- app/Http/Controllers/Admin/VisitController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index b98d793..cdd91a1 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -74,7 +74,7 @@ class VisitController extends CommonController $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); + $qry->whereIn('accept_admin_id1', $adminIds); }); }); })->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc'); From 0c7416efcea96f283e253ba90e465e0feec7f609 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Fri, 21 Mar 2025 13:49:36 +0800 Subject: [PATCH 2/6] update --- app/Http/Controllers/Admin/VisitController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index cdd91a1..b98d793 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -74,7 +74,7 @@ class VisitController extends CommonController $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_id1', $adminIds); + $qry->whereIn('accept_admin_id', $adminIds); }); }); })->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc'); From 3d0c99f765cab571dd38b1c3fd90455a3e23a853 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Fri, 21 Mar 2025 13:55:37 +0800 Subject: [PATCH 3/6] update --- app/Http/Controllers/Admin/VisitController.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index b98d793..55b2bea 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -70,13 +70,13 @@ 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); +// $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) { From 78e9ba7b94943ea4070d5042b33206f9e3698d6b Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Fri, 21 Mar 2025 14:07:20 +0800 Subject: [PATCH 4/6] update --- .../Controllers/Admin/VisitController.php | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index 55b2bea..a160c1b 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -45,7 +45,7 @@ class VisitController extends CommonController public function index() { $all = request()->all(); - $list = Visit::with('accompany.department','gateLogs', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department', 'audit.auditAdmin')->where(function ($query) use ($all) { + $list = Visit::with('accompany.department', 'gateLogs', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department', 'audit.auditAdmin')->where(function ($query) use ($all) { if (isset($all['keyword'])) { $query->where('name', 'like', '%' . $all['keyword'] . '%'); } @@ -70,29 +70,29 @@ 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); + $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) { return [ - '姓名' => $info['name']??'', - '类型' => $info['type_text']??'', - '审核状态' => $info['audit_status_text']??'', + '姓名' => $info['name'] ?? '', + '类型' => $info['type_text'] ?? '', + '审核状态' => $info['audit_status_text'] ?? '', '是否随访' => empty($info['follw_people']) ? '否' : '是', - '预约时间' => $info['date']??'', - '证件号' => $info['idcard']??'', + '预约时间' => $info['date'] ?? '', + '证件号' => $info['idcard'] ?? '', '证件类型' => $info['credent'] == 1 ? '身份证' : '护照', - '单位名称' => $info['company_name']??'', - '手机号' => $info['mobile']??'', + '单位名称' => $info['company_name'] ?? '', + '手机号' => $info['mobile'] ?? '', '访问时间' => ($info['visit_time']['start_time']) ?? '', '结束时间' => ($info['visit_time']['end_time']) ?? '', - '创建时间' => $info['created_at']??'', + '创建时间' => $info['created_at'] ?? '', ]; }); } else { @@ -127,7 +127,7 @@ class VisitController extends CommonController if ($validator->fails()) { return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); } - $detail = Visit::with('accompany.department','logs.admin', 'logs.user', 'audit.auditAdmin', 'visitTime', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department', 'visitArea', 'audit.auditAdmin')->find($all['id']); + $detail = Visit::with('accompany.department', 'logs.admin', 'logs.user', 'audit.auditAdmin', 'visitTime', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department', 'visitArea', 'audit.auditAdmin')->find($all['id']); return $this->success($detail); } From f80aa0d83dcaa938a61862c09d7a2b7d77507b63 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Fri, 21 Mar 2025 14:07:58 +0800 Subject: [PATCH 5/6] update --- app/Http/Controllers/Admin/AuthController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/AuthController.php b/app/Http/Controllers/Admin/AuthController.php index a407093..37fda51 100644 --- a/app/Http/Controllers/Admin/AuthController.php +++ b/app/Http/Controllers/Admin/AuthController.php @@ -94,7 +94,7 @@ class AuthController extends Controller */ public function me() { - $user = Admin::with('department')->find($this->guard()->user()->id); + $user = Admin::with('department', 'role')->find($this->guard()->user()->id); return $this->success($user); } From 4458739f33a07f01c93580146ef01d7a1d7b79f4 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Fri, 21 Mar 2025 14:27:18 +0800 Subject: [PATCH 6/6] update --- app/Http/Controllers/Admin/VisitController.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index a160c1b..be86e62 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -35,6 +35,7 @@ class VisitController extends CommonController * @OA\Parameter(name="my_audit", in="query", @OA\Schema(type="string"), required=false, description="是否显示我审核的记录0否1是，默认0"), * @OA\Parameter(name="my_accept_admin", in="query", @OA\Schema(type="string"), required=false, description="是否显示接待人员是自己的0否1是，默认0"), * @OA\Parameter(name="long_time", in="query", @OA\Schema(type="string"), required=false, description="是否长期访客0否1是"), + * @OA\Parameter(name="is_auth", in="query", @OA\Schema(type="string"), required=true, description="is_auth是否鉴权0否1是"), * @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"), * @OA\Response( * response="200", @@ -45,7 +46,8 @@ class VisitController extends CommonController public function index() { $all = request()->all(); - $list = Visit::with('accompany.department', 'gateLogs', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department', 'audit.auditAdmin')->where(function ($query) use ($all) { + $is_auth = request('is_auth', 1); + $list = Visit::with('accompany.department', 'gateLogs', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department', 'audit.auditAdmin')->where(function ($query) use ($all, $is_auth) { if (isset($all['keyword'])) { $query->where('name', 'like', '%' . $all['keyword'] . '%'); } @@ -70,13 +72,15 @@ 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); + if ($is_auth) { + $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); + }); }); - }); + } })->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) {