From acab32ddf72346f54e7eec802fb6081ab1e0788d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 31 Jul 2023 10:56:08 +0800
Subject: [PATCH] 短信,站内信告警调整(新增近1h水位陡降,陡升,水位超校核洪水位告警,水位接近设计洪水位告警,水位大幅超汛限告警,水位小幅超汛限告警),公用方法调整

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java
index 0688153..673444d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java
@@ -33,15 +33,9 @@
 	public Object selectAlarmRulePage(IPage<AlarmRuleVO> page, AlarmRuleVO alarmRule) {
 		if (null != alarmRule.getIsExport()){
 			List<AlarmRuleVO> alarmRuleVOS = baseMapper.selectAlarmRulePage(null, alarmRule);
-			for (AlarmRuleVO alarmRuleVO : alarmRuleVOS) {
-				alarmRuleVO.setAlarmPerson(String.join(",",sysClient.getRoleNames(alarmRuleVO.getAlarmPerson()).getData()));
-			}
 			return alarmRuleVOS;
 		}
 		List<AlarmRuleVO> alarmRuleVOS = baseMapper.selectAlarmRulePage(page, alarmRule);
-		for (AlarmRuleVO alarmRuleVO : alarmRuleVOS) {
-			alarmRuleVO.setAlarmPerson(String.join(",",sysClient.getRoleNames(alarmRuleVO.getAlarmPerson()).getData()));
-		}
 		return page.setRecords(alarmRuleVOS);
 	}
 

--
Gitblit v1.9.3