From 5b8eab81c7a5ee4180e4bae15db45620a490a582 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 21 Nov 2023 17:06:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 beb3a96..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
@@ -83,18 +83,22 @@
AND NAG.type = #{vo.type}
</if>
<if test="vo.type != null and vo.type !='' and vo.type == 3">
- AND (NAG.type = '3' or NAG.type = '4' or NAG. type = '5')
+ AND (NAG.type = '3' or NAG.type = '4' or NAG.type = '5')
</if>
<if test="vo.pointId != null and vo.pointId !='' ">
AND NAG.POINT_id = #{vo.pointId}
</if>
- <if test="vo.cdName != null and vo.cdName !=''">
+ <if test="vo.cdName != null and vo.cdName !='' and vo.type != 3">
AND acb."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