diff --git a/app/Http/Controllers/Api/DeviceController.php b/app/Http/Controllers/Api/DeviceController.php index 482fcfe..13b734e 100644 --- a/app/Http/Controllers/Api/DeviceController.php +++ b/app/Http/Controllers/Api/DeviceController.php @@ -20,10 +20,10 @@ class DeviceController extends Controller $query = Device::query(); if($monitorId){ - $deviceIds = MonitorDevice::where('monitor_id', $monitorId)->pluck('id')->toArray(); + $deviceIds = MonitorDevice::where('monitor_id', $monitorId)->pluck('device_id')->toArray(); $query->whereIn('id', $deviceIds); }elseif($regionId){ - $monitorIds = RegionMonitor::where('region_id', $regionId)->pluck('id')->toArray(); + $monitorIds = RegionMonitor::where('region_id', $regionId)->pluck('device_id')->toArray(); if(count($monitorIds) > 0){ $deviceIds = MonitorDevice::whereIn('monitor_id', $monitorIds)->pluck('id')->toArray();