From dd812d893b600e20d9cf1dd9dfc67b6d724b72bd Mon Sep 17 00:00:00 2001 From: liyinglin Date: Wed, 3 Jan 2024 11:42:05 +0800 Subject: [PATCH] 1 --- app/Http/Controllers/Admin/OrdersController.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php index 2c09f3c..50804d1 100755 --- a/app/Http/Controllers/Admin/OrdersController.php +++ b/app/Http/Controllers/Admin/OrdersController.php @@ -206,6 +206,7 @@ class OrdersController extends CommonController public function artboard(Request $request) { $has_ongoing_order = $request->get('has_ongoing_order', 1); + $project_id = $request->get('project_id'); $userId = auth()->id(); // 判断是否护士长 $roleId = Role::where('name', 'like', '%护士长%')->where('guard_name', 'admin')->value('id'); @@ -215,9 +216,9 @@ class OrdersController extends CommonController $areaId = []; if ($hushizhang) { $user = auth()->user(); - $areaId = AdminAreaLink::where(function ($qeury) use ($request) { - if ($request->project_id) { - $qeury->where('project_id', $request->project_id); + $areaId = AdminAreaLink::where(function ($qeury) use ($project_id) { + if ($project_id) { + $qeury->where('project_id', $project_id); } })->where('admin_id', $user->id)->pluck('area_id'); } @@ -255,7 +256,7 @@ class OrdersController extends CommonController } $projects = (new StatisticsController())->_checkProjects(); - return view($this->bladePath . ".artboard", compact("data","projects")); + return view($this->bladePath . ".artboard", compact("data", "projects", "project_id")); }