From f7076ec465035a342e1b0750c737a5a6089e2001 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 20 Nov 2023 21:34:03 +0800
Subject: [PATCH] 大坝安全监控预警列表

---
 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
index 7faad62..523a395 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
@@ -88,16 +88,17 @@
         <if test="vo.pointId != null and vo.pointId !='' ">
             AND NAG.POINT_id = #{vo.pointId}
         </if>
-        <if test="vo.cdName != null and vo.cdName !='' and vo.tpe != 3">
+        <if test="vo.cdName != null and vo.cdName !='' and vo.type != 3">
             AND acb."cd_nm" LIKE CONCAT('%',#{vo.cdName},'%')
-        </if>
-        <if test="vo.cdName != null and vo.cdName !='' and vo.tpe == 3">
-            AND awcb."cd_nm" LIKE CONCAT('%',#{vo.cdName},'%')
         </if>
         AND NAG.dam_id =  #{vo.damId}
         ORDER BY NAG."TIME" DESC
         )temp
         LEFT JOIN SJZT_MD."att_wy_cd_base" awcb ON awcb."res_cd" =   temp.DAM_ID AND temp.POINT_ID = awcb."cd"
+        WHERE 1=1
+        <if test="vo.cdName != null and vo.cdName !='' and vo.type == 3">
+            AND awcb."cd_nm" LIKE CONCAT('%',#{vo.cdName},'%')
+        </if>
 
 
 

--
Gitblit v1.9.3