Merge branch 'dyf-device' into 6170

2025-10-08 14:12:09 +08:00
parent 840c4fd68f 6c99cef65d
commit 9f0155a6e3
5 changed files with 61 additions and 20 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
@ -71,6 +71,9 @@
            <if test="criteria.deviceStatus != null">
                and da.active = #{criteria.deviceStatus}
            </if>
+            <if test="criteria.onlineStatus != null">
+                and d.online_status = #{criteria.onlineStatus}
+            </if>
            <if test="criteria.groupId != null">
                and d.group_id = #{criteria.groupId}
            </if>