From 1ef1640c9eebf928b28befa55c5f3e3f8fece4b9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 01 Feb 2024 10:12:59 +0800
Subject: [PATCH] fix:代码优化测试提交

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

diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index 996b601..24526c4 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -274,7 +274,14 @@
         select d.name,d.state,d.mac from device as d where organization_id=#{organizationId}
     </select>
 
-    <select id="getList" resultType="com.moral.api.vo.OnlineRateVo">
-        select d.name,d.state,d.mac from device as d where organization_id=#{organizationId}
+
+    <select id="getLists" resultType="com.moral.api.vo.OnlineRateVo">
+        select d.name,d.state,d.mac from device as d where organization_id=#{organizationId} and is_delete=0
+        <if test="state !=null and state == 0" >
+            and  state=#{state}
+        </if>
+        <if test="state !=null and state != 0">
+            and  state<![CDATA[>=]]>#{state}
+        </if>
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0