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()); }