|
@ -194,14 +194,16 @@ public class IotDeviceController extends EnvelopRestEndpoint {
|
|
|
size = 10;
|
|
|
}
|
|
|
|
|
|
if(isBinding==3){
|
|
|
return iotDeviceService.findDevice();
|
|
|
}
|
|
|
|
|
|
if (isBinding == null) {
|
|
|
return iotDeviceService.queryPage(sn, hospital, hospitalName, orderId, purcharseId, productId, name, categoryCode, manufacturerId, page, size);
|
|
|
} else {
|
|
|
return iotDeviceService.queryPage(sn, hospital, orderId, purcharseId, isBinding, page, size);
|
|
|
|
|
|
if(isBinding == 3){//去重取设备名称
|
|
|
return iotDeviceService.findDevice();
|
|
|
}else{
|
|
|
return iotDeviceService.queryPage(sn, hospital, orderId, purcharseId, isBinding, page, size);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
} catch (Exception e) {
|