Merge branch 'main' into dyf-device

2025-07-30 17:07:29 +08:00
parent abd6d3aa3c ac353b1078
commit 4fa4e5ec29
37 changed files with 2737 additions and 188 deletions
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
@ -151,7 +151,8 @@
        d.binding_time
        from device d
        inner join device_type dt on d.device_type = dt.id
-        where d.binding_user_id = #{criteria.bindingUserId}
+        inner join app_device_bind_record c on d.id = c.device_id
+        where c.binding_user_id = #{criteria.bindingUserId}
        <if test="criteria.deviceType != null">
            and d.device_type = #{criteria.deviceType}
        </if>