From cae3b043d8a8a08e176839d0c23a4432e5d9f5f4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 15:14:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 3109bed..6fcefc9 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -832,13 +832,15 @@
public List<User> getPoliceUser(String longitude, String latitude, String houseCode) {
List<User> policeUser = baseMapper.getPoliceUser(longitude, latitude);
// todo 自动生成警单
- IPoliceAlarmRecordsService policeAlarmRecordsService = SpringUtil.getBean(IPoliceAlarmRecordsService.class);
- PoliceAlarmRecordsEntity policeAlarmRecordsEntity = new PoliceAlarmRecordsEntity();
- policeAlarmRecordsEntity.setHouseCode(houseCode);
- if (policeUser != null && policeUser.size() == 1) {
- policeAlarmRecordsEntity.setPoliceId(policeUser.get(0).getId());
+ if (StringUtils.isNotBlank(houseCode)) {
+ IPoliceAlarmRecordsService policeAlarmRecordsService = SpringUtil.getBean(IPoliceAlarmRecordsService.class);
+ PoliceAlarmRecordsEntity policeAlarmRecordsEntity = new PoliceAlarmRecordsEntity();
+ policeAlarmRecordsEntity.setHouseCode(houseCode);
+ if (policeUser != null && policeUser.size() == 1) {
+ policeAlarmRecordsEntity.setPoliceId(policeUser.get(0).getId());
+ }
+ policeAlarmRecordsService.save(policeAlarmRecordsEntity);
}
- policeAlarmRecordsService.save(policeAlarmRecordsEntity);
return policeUser;
}
}
--
Gitblit v1.9.3