From bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 14 Jan 2026 11:27:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java
index 5e2f51a..c9aae7c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java
@@ -45,6 +45,11 @@
return page.setRecords(baseMapper.selectFwPoliceStationPage(page, fwPoliceStation));
}
+ @Override
+ public List<FwPoliceStationVO> selectFwPoliceStationList() {
+ return baseMapper.selectFwPoliceStationList();
+ }
+
@Override
public List<FwPoliceStationExcel> exportFwPoliceStation(Wrapper<FwPoliceStationEntity> queryWrapper) {
@@ -88,19 +93,19 @@
deptId = null;
}
}
- String areaCode = HeaderUtils.getAreaCode();
- if (StringUtil.isBlank(areaCode)) {
- areaCode = fwPoliceStation.getAreaCode();
- }
+// String areaCode = HeaderUtils.getAreaCode();
+// if (StringUtil.isBlank(areaCode)) {
+// areaCode = fwPoliceStation.getAreaCode();
+// }
Date now = new Date();
fwPoliceStation.setCreateUser(userId);
fwPoliceStation.setUpdateUser(userId);
if (deptId != null) {
fwPoliceStation.setCreateDept(deptId);
}
- if (StringUtil.isNotBlank(areaCode)) {
- fwPoliceStation.setAreaCode(areaCode);
- }
+// if (StringUtil.isNotBlank(areaCode)) {
+// fwPoliceStation.setAreaCode(areaCode);
+// }
fwPoliceStation.setCreateTime(now);
fwPoliceStation.setUpdateTime(now);
}
--
Gitblit v1.9.3