From 2d6a0cdcb1e31510a6f7776abab17cc5cb82fdcb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 13 九月 2023 17:50:04 +0800
Subject: [PATCH] 修改2.0   9.13

---
 base-server/src/main/resources/mapper/DeviceMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/base-server/src/main/resources/mapper/DeviceMapper.xml b/base-server/src/main/resources/mapper/DeviceMapper.xml
index 9509b45..02e3d4f 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 name like concat('%',#{message},'%')
+            and device.name like concat('%',#{message},'%')
         </if>
     </select>
     <!--鏍规嵁璁惧鍒嗙粍鏌ヨ璁惧-->
@@ -70,6 +70,7 @@
         select distinct father
         from mom_ocean.device
         where state = 1
+          and type = #{type}
     </select>
     <!--鎵归噺鍒犻櫎-->
     <update id="delAllDevice">

--
Gitblit v1.9.3