main
parent
5163c84c65
commit
afa5c686e8
|
|
@ -20,10 +20,10 @@ class DeviceController extends Controller
|
||||||
$query = Device::query();
|
$query = Device::query();
|
||||||
|
|
||||||
if($monitorId){
|
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);
|
$query->whereIn('id', $deviceIds);
|
||||||
}elseif($regionId){
|
}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){
|
if(count($monitorIds) > 0){
|
||||||
$deviceIds = MonitorDevice::whereIn('monitor_id', $monitorIds)->pluck('id')->toArray();
|
$deviceIds = MonitorDevice::whereIn('monitor_id', $monitorIds)->pluck('id')->toArray();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue