From 45e8ce118789aad77ba75b24b9455041d8a8d57c Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 29 八月 2023 10:23:03 +0800
Subject: [PATCH] MOM系统-8-29

---
 standard-server/src/main/resources/mapper/DeviceMapper.xml |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/standard-server/src/main/resources/mapper/DeviceMapper.xml b/standard-server/src/main/resources/mapper/DeviceMapper.xml
index 38e63fd..af9dd90 100644
--- a/standard-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/standard-server/src/main/resources/mapper/DeviceMapper.xml
@@ -59,7 +59,14 @@
     <select id="getDeviceNameByGroup" resultType="java.util.Map">
         select id, name
         from mom_ocean.device
-        where state=1
-        and father=#{deviceGroup}
+        where state = 1
+          and father = #{deviceGroup}
+          and device_status in (1, 5)
+    </select>
+    <!--閫夋嫨璁惧缁�-->
+    <select id="chooseDevGroup" resultType="java.util.Map">
+        select distinct father
+        from mom_ocean.device
+        where state=1 and device_status in(1,5)
     </select>
 </mapper>

--
Gitblit v1.9.3