From a62666cf3a69198d68cce5c9890f0a038315d3bc Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 09 九月 2023 17:00:15 +0800
Subject: [PATCH] 修改bug6.0 9.9
---
base-server/src/main/resources/mapper/DeviceMapper.xml | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/base-server/src/main/resources/mapper/DeviceMapper.xml b/base-server/src/main/resources/mapper/DeviceMapper.xml
index 8da494e..d3ae2f5 100644
--- a/base-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/base-server/src/main/resources/mapper/DeviceMapper.xml
@@ -30,7 +30,7 @@
</if>
<if test="message!=null and message!=''">
and code like concat('%',#{message},'%')
- or name like concat('%',#{message},'%')
+ or device.name like concat('%',#{message},'%')
</if>
</select>
<!--鏍规嵁璁惧鍒嗙粍鏌ヨ璁惧-->
@@ -48,6 +48,29 @@
where state = 1
and device_status in (1, 5)
</select>
+
+ <!--鍘熸潗鏂欐楠�-閫夋嫨璁惧-->
+ <resultMap id="oneMap" type="map">
+ <result property="name" column="father"/>
+ <collection property="children" resultMap="twoMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="twoMap" type="map">
+ <id property="id" column="id"/>
+ <result property="name" column="name"/>
+ </resultMap>
+ <select id="chooseDevice" resultMap="oneMap">
+ select id, father, name
+ from mom_ocean.device
+ where state = 1
+ and device_status in (1, 5)
+ </select>
+
+ <!--鏂板閫夋嫨璁惧缁�-->
+ <select id="listGroup" resultType="java.lang.String">
+ select distinct father
+ from mom_ocean.device
+ where state = 1
+ </select>
<!--鎵归噺鍒犻櫎-->
<update id="delAllDevice">
update mom_ocean.device
--
Gitblit v1.9.3