From f2921ff12f3e8b17b490681f337788445ad211e4 Mon Sep 17 00:00:00 2001
From: daiyongfei <974332738@qq.com>
Date: Sat, 19 Jul 2025 09:17:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87-=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/service/impl/DeviceServiceImpl.java           | 6 ++++++
 1 file changed, 6 insertions(+)

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();