|
|
@ -117,9 +117,10 @@ public class FavoritedDeviceServiceImpl implements FavoritedDeviceService { |
|
|
data = alarmDataMap.get(deviceId); |
|
|
data = alarmDataMap.get(deviceId); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (data != null) { |
|
|
if (data == null) { |
|
|
resultList.add(data); |
|
|
data = vo; // 保留原 VO,避免返回条数不足
|
|
|
} |
|
|
} |
|
|
|
|
|
resultList.add(data); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return new PageInfo<>(resultList); |
|
|
return new PageInfo<>(resultList); |
|
|
|