From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
base-server/src/main/resources/mapper/DeviceMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/base-server/src/main/resources/mapper/DeviceMapper.xml b/base-server/src/main/resources/mapper/DeviceMapper.xml
index 166307e..f8f6a0e 100644
--- a/base-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/base-server/src/main/resources/mapper/DeviceMapper.xml
@@ -8,7 +8,7 @@
WHERE d.state = 1
AND d.type = #{type}
<if test="search_class !=null and search_class != ''">
- AND d.`name` like concat('%',#{search_class},'%')
+ AND d.`father` like concat('%',#{search_class},'%')
</if>
</select>
<!--鏌ヨ璁惧缁存姢 鍙充晶鍒楄〃灞曠ず璇ヨ澶囩粍涓嬬殑鎵�鏈夎澶�-->
@@ -30,7 +30,7 @@
</if>
<if test="message!=null and message!=''">
and code like concat('%',#{message},'%')
- or device.name like concat('%',#{message},'%')
+ and device.name like concat('%',#{message},'%')
</if>
</select>
<!--鏍规嵁璁惧鍒嗙粍鏌ヨ璁惧-->
@@ -41,15 +41,16 @@
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)
+ and type = 1
</select>
- <!--鍘熸潗鏂欐楠�-閫夋嫨璁惧-->
+ <!--閫夋嫨妫�楠岃澶�-->
<resultMap id="oneMap" type="map">
<result property="name" column="father"/>
<collection property="children" resultMap="twoMap" javaType="List"/>
@@ -63,6 +64,7 @@
from mom_ocean.device
where state = 1
and device_status in (1, 5)
+ and type = 2
</select>
<!--鏂板閫夋嫨璁惧缁�-->
--
Gitblit v1.9.3