Commit 67f40bd2 by huangjy

fix:设备周报取值问题

parent d29fc189
......@@ -411,7 +411,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
PlatDevice platDevice = platElderRealTimeService.getBreathDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
if (platDevice != null) {
if (!platDevice.getTenantId().equals(platElderIdDTO.getTenantId())) {
if (StringUtils.isNotEmpty(platElderIdDTO.getTenantId()) && !platDevice.getTenantId().equals(platElderIdDTO.getTenantId())) {
platDevice = platDeviceService.getOne(new QueryWrapper<PlatDevice>().lambda()
.eq(BaseBusEntity::getTenantId,platElderIdDTO.getTenantId())
.eq(PlatDevice::getOriDeviceId, platElderIdDTO.getDeviceId()).last("limit 1"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment