From ff81b791fcb04cde01029629459504bb11443fb5 Mon Sep 17 00:00:00 2001
From: chenyouting <514333061@qq.com>
Date: Thu, 10 Jul 2025 08:57:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fuyuanshen/app/controller/AppDeviceController.java   | 2 +-
 .../src/main/resources/mapper/equipment/DeviceMapper.xml     | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java
index 945c30f..1344160 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java
@@ -32,7 +32,7 @@ public class AppDeviceController extends BaseController {
     private final APPDeviceService appDeviceService;
 
     /**
-     * 查询文件列表
+     * 查询设备列表
      */
     @GetMapping("/list")
     public TableDataInfo<AppDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) {
diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
index 5af643a..44aea49 100644
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
@@ -5,7 +5,7 @@
         <id column="id" property="id"/>
         <result column="device_type" property="deviceType"/>
         <result column="customer_id" property="customerId"/>
-        <!--<result column="device_no" property="deviceNo"/>-->
+        <result column="device_no" property="deviceNo"/>
         <result column="device_name" property="deviceName"/>
         <result column="device_pic" property="devicePic"/>
         <result column="device_mac" property="deviceMac"/>
@@ -176,6 +176,9 @@
         from device d
                  inner join device_type dt on d.device_type = dt.id
         where d.binding_user_id = #{criteria.bindingUserId}
+        <if test="criteria.deviceType != null">
+            and d.device_type = #{criteria.deviceType}
+        </if>
     </select>
 
     <!-- 获取分配设备的客户 -->