From 6829b805861513b68df6a91c35b85312b48f90bb Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 04 Jul 2023 11:54:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml
index 530295a..229bfba 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml
@@ -13,9 +13,6 @@
left join SJZT_MD."att_res_base" arb on arb."guid" = sar.reservoir_number
left join SJZT_MD."att_ad_base" aab on aab."guid" = arb."interior_ad_guid"
where sar.is_deleted = 0
- <if test="alarmRecord.alarmSurveyStationName!=null and alarmRecord.alarmSurveyStationName!=''">
- and alarm_survey_station_name like concat(concat('%',#{alarmRecord.alarmSurveyStationName}),'%')
- </if>
<if test="alarmRecord.reservoirName!=null and alarmRecord.reservoirName!=''">
and sar.reservoir_name like concat(concat('%',#{alarmRecord.reservoirName}),'%')
</if>
--
Gitblit v1.9.3