diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java
index 92c1c836..5e09e791 100644
--- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java
+++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java
@@ -374,7 +374,8 @@ public class DeviceInfoServiceImpl implements DeviceInfoService {
     public List<DeviceStatisticsInfoRespVO> getDeviceStatisticsList(String baseId) {
 
         LambdaQueryWrapperX<DeviceInfoDO> wrapperX = new LambdaQueryWrapperX<>();
-        wrapperX.eq(DeviceInfoDO::getBaseId, baseId);
+        wrapperX.eqIfPresent(DeviceInfoDO::getBaseId, baseId);
+        wrapperX.eq(DeviceInfoDO::getTenantId, String.valueOf(getLoginUser().getTenantId()));
         wrapperX.eq(DeviceInfoDO::getDeleted, CommonConstants.NO_CODE);
 
         List<DeviceInfoDO> doList = deviceInfoMapper.selectList(wrapperX);