diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
index 6301d5b..881f985 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
@@ -101,6 +101,12 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
     public TableDataInfo<Device> queryAll(DeviceQueryCriteria criteria, Page<Device> page) throws IOException {
 
         criteria.setCurrentOwnerId(LoginHelper.getUserId());
+        if (criteria.getDeviceType() != null) {
+            DeviceTypeGrants deviceTypeGrant = deviceTypeGrantsMapper.selectById(criteria.getDeviceType());
+            if (deviceTypeGrant != null) {
+                criteria.setDeviceType(deviceTypeGrant.getDeviceTypeId());
+            }
+        }
         IPage<Device> devices = deviceMapper.findAll(criteria, page);
 
         List<Device> records = devices.getRecords();