From a0a6f95ec5b92be03385eea83b64bf97fcbfa17e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 02 Nov 2023 17:08:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/resources/mapper/SpecialDeviceMapper.xml | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/SpecialDeviceMapper.xml b/screen-api/src/main/resources/mapper/SpecialDeviceMapper.xml
index 452b9f0..60e231b 100644
--- a/screen-api/src/main/resources/mapper/SpecialDeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/SpecialDeviceMapper.xml
@@ -7,6 +7,7 @@
<id column="id" property="id"/>
<result column="name" property="name"/>
<result column="mac" property="mac"/>
+ <result column="guid" property="guid"/>
<result column="operate_ids" property="operateIds"/>
<result column="organization_id" property="organizationId"/>
<result column="device_version_id" property="deviceVersionId"/>
@@ -16,4 +17,13 @@
<result column="is_delete" property="isDelete"/>
</resultMap>
+ <select id="selectSpecialDevice" resultType="com.moral.api.pojo.vo.device.AppDeviceVo">
+ SELECT id,`name`,mac,special_type FROM special_device
+ WHERE 1=1
+ <if test="organization_id !=null">
+ AND organization_id=#{organizationId}
+ </if>
+ AND is_delete =0
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0