From 6f2c07bbd6f50f1f9fe29bfa6fec5a6568897432 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 18 Mar 2021 10:43:01 +0800
Subject: [PATCH] 警情分发逻辑修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
index 3cb02e4..39d3519 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -194,8 +194,8 @@
alarm.setAlarmPeople(name);
alarm.setAlarmId(name);
-
- return R.status(alarmService.saveOrUpdate(alarm));
+ return null;
+ //return R.status(alarmService.saveOrUpdate(alarm));
}
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 2f51aa4..436f7cc 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
@@ -333,6 +333,6 @@
sa.alarmType = sb.alarmType
</select>
- <select id="queryPolice" resultType="java.util.HashMap">
+ <select id="queryPolice" resultType="java.util.List">
SELECT * FROM jfpth.blade_user WHERE is_deleted != '1' and role_id ="1370562810882502657"</select>
</mapper>
--
Gitblit v1.9.3