|
@@ -141,7 +141,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
.in(DeviceInfo::getDeviceId, dto.getDeviceId())
|
|
.in(DeviceInfo::getDeviceId, dto.getDeviceId())
|
|
.select(DeviceInfo::getDeviceId, DeviceInfo::getDeviceName);
|
|
.select(DeviceInfo::getDeviceId, DeviceInfo::getDeviceName);
|
|
List<DeviceInfo> deviceInfoList = list(lqw);
|
|
List<DeviceInfo> deviceInfoList = list(lqw);
|
|
- return R.ok(deviceInfoList.stream().collect(Collectors.toMap(DeviceInfo::getDeviceId, DeviceInfo::getDeviceName)));
|
|
|
|
|
|
+ return R.ok(deviceInfoList.stream().collect(Collectors.toMap(DeviceInfo::getDeviceId, i->Optional.ofNullable(i.getDeviceName()).orElse(""))));
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|