`fix`

ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblEquipmentSbookServiceImpl.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.data.domain.TblEquipmentOrganizational;
+import com.ruoyi.data.domain.TblSensor;
 import com.ruoyi.data.mapper.TblEquipmentMapper;
 import com.ruoyi.data.mapper.TblEquipmentOrganizationalMapper;
 import com.ruoyi.system.mapper.SysDictDataMapper;
@@ -24,9 +25,11 @@ import com.ruoyi.data.domain.TblEquipmentSbook;
 import com.ruoyi.data.mapper.TblEquipmentSbookMapper;
 import com.ruoyi.data.service.ITblEquipmentSbookService;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 /**
  * 设备台账Service业务层处理
@@ -125,6 +128,9 @@ public class TblEquipmentSbookServiceImpl implements ITblEquipmentSbookService {
                 ids.add(tblEquipmentSbook.getEquipmentTreeId());
                 w.in("u.equipment_tree_id", ids);
             });
+        if(tblEquipmentSbook.getGatewayId()!=null ){
+            wrapper.eq("u.gateway_id", tblEquipmentSbook.getGatewayId());
+        }
         return wrapper;
     }