From 17bb5d74bc4a57b117b776745774c23d78dba381 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 14 Nov 2023 13:50:18 +0800
Subject: [PATCH] fix：修改测试环境redis
---
screen-api/src/main/resources/mapper/DeviceMapper.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index abda196..959ae30 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -192,4 +192,20 @@
select mac from device where organization_id = #{organizationId} order by id desc
</select>
+
+ <select id="getDevices" resultType="com.moral.api.pojo.vo.device.AppDeviceVo">
+ SELECT d.id,d.`name`,d.mac,d.special_type FROM device as d
+ where 1=1
+ <if test="organizationId !=null">
+ AND organization_id = #{organizationId}
+ </if>
+ and mac LIKE "%"#{mac}"%" or `name` like "%"#{mac}"%" AND is_delete = 0
+ union
+ SELECT sd.id,sd.`name`,sd.mac,sd.special_type FROM special_device as sd
+ WHERE 1=1
+ <if test="organizationId !=null">
+ AND organization_id = #{organizationId}
+ </if>
+ and mac LIKE "%"#{mac}"%" AND is_delete = 0
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0