From 373ca437b9ccfab8988fb3394701e8fef4eb01d8 Mon Sep 17 00:00:00 2001 From: "iVampireSP.com" Date: Tue, 30 Aug 2022 14:52:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B7=A5=E5=8D=95=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/User/WorkOrder/WorkOrderController.php | 2 +- app/Models/WorkOrder/WorkOrder.php | 2 +- app/Models/Workorder/Workorder.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/User/WorkOrder/WorkOrderController.php b/app/Http/Controllers/User/WorkOrder/WorkOrderController.php index a50ab57..dd7a15c 100644 --- a/app/Http/Controllers/User/WorkOrder/WorkOrderController.php +++ b/app/Http/Controllers/User/WorkOrder/WorkOrderController.php @@ -12,7 +12,7 @@ class WorkOrderController extends Controller // public function index(Request $request, WorkOrder $workOrder) { - $workOrder = $workOrder->user()->simplePaginate(10); + $workOrder = $workOrder->thisUser()->with('user')->simplePaginate(10); return $this->success($workOrder); } diff --git a/app/Models/WorkOrder/WorkOrder.php b/app/Models/WorkOrder/WorkOrder.php index e29a1bb..1625407 100644 --- a/app/Models/WorkOrder/WorkOrder.php +++ b/app/Models/WorkOrder/WorkOrder.php @@ -52,7 +52,7 @@ public function scopeThisModule($query) return $query->where('module_id', auth('remote')->id()); } - public function scopeUser($query) + public function scopeThisUser($query) { return $query->where('user_id', auth()->id()); } diff --git a/app/Models/Workorder/Workorder.php b/app/Models/Workorder/Workorder.php index e29a1bb..1625407 100644 --- a/app/Models/Workorder/Workorder.php +++ b/app/Models/Workorder/Workorder.php @@ -52,7 +52,7 @@ public function scopeThisModule($query) return $query->where('module_id', auth('remote')->id()); } - public function scopeUser($query) + public function scopeThisUser($query) { return $query->where('user_id', auth()->id()); }