From b1d5e0d7aadc91ce1415290915868694bd766dfd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 27 Jul 2021 17:32:13 +0800
Subject: [PATCH] 添加时间筛选
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 3 ++-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index 5d1f7f7..997d27b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -809,7 +809,8 @@
WHERE
<if test="alarm.securityArr!=null and alarm.securityArr!=''">
- securityId = "" or securityId IS NULL
+ (securityId = "" or securityId IS NULL)
+ AND jtype != 2
AND securityArr LIKE concat('%',#{alarm.securityArr},'%')
</if>
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
index 8a7cf23..feddfea 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
@@ -310,7 +310,7 @@
iWjService.insertfeed(wj);
}
}
- alarmService.updateJtype(operation.getJid(), "2", null, null,null);
+// alarmService.updateJtype(operation.getJid(), "2", null, null,null);
return R.success("新增成功");
}
--
Gitblit v1.9.3