|
@@ -336,8 +336,12 @@ public class DeviceInfoController {
|
|
|
|
|
|
List<DeviceInfo> deviceInfoList = deviceInfoService.findByCompanyId(companyId);
|
|
List<DeviceInfo> deviceInfoList = deviceInfoService.findByCompanyId(companyId);
|
|
List<String> deviceIdList = new ArrayList<String>();
|
|
List<String> deviceIdList = new ArrayList<String>();
|
|
- for (DeviceInfo deviceInfo:deviceInfoList) {
|
|
|
|
- deviceIdList.add(deviceInfo.getId());
|
|
|
|
|
|
+ if(deviceIdList.size() > 0) {
|
|
|
|
+ for (DeviceInfo deviceInfo : deviceInfoList) {
|
|
|
|
+ deviceIdList.add(deviceInfo.getId());
|
|
|
|
+ }
|
|
|
|
+ }else{
|
|
|
|
+ deviceIdList.add("-1");
|
|
}
|
|
}
|
|
list = deviceInfoService.findByDeviceIdList(deviceIdList);
|
|
list = deviceInfoService.findByDeviceIdList(deviceIdList);
|
|
}
|
|
}
|