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/FwDefenseSceneServiceImpl.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/FwDefenseSceneServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java
index c01048d..d54f4ac 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java
@@ -133,6 +133,11 @@
return result;
}
+ @Override
+ public List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected, Long zoneId, Long areaId) {
+ return baseMapper.selectFwDefenseSceneList(filterSelected, zoneId, areaId);
+ }
+
private List<Long> parseIdList(String ids) {
if (StringUtil.isBlank(ids)) {
return Collections.emptyList();
@@ -216,19 +221,19 @@
deptId = null;
}
}
- String areaCode = HeaderUtils.getAreaCode();
- if (StringUtil.isBlank(areaCode)) {
- areaCode = fwDefenseScene.getAreaCode();
- }
+// String areaCode = HeaderUtils.getAreaCode();
+// if (StringUtil.isBlank(areaCode)) {
+// areaCode = fwDefenseScene.getAreaCode();
+// }
Date now = new Date();
fwDefenseScene.setCreateUser(userId);
fwDefenseScene.setUpdateUser(userId);
if (deptId != null) {
fwDefenseScene.setCreateDept(deptId);
}
- if (StringUtil.isNotBlank(areaCode)) {
- fwDefenseScene.setAreaCode(areaCode);
- }
+// if (StringUtil.isNotBlank(areaCode)) {
+// fwDefenseScene.setAreaCode(areaCode);
+// }
fwDefenseScene.setCreateTime(now);
fwDefenseScene.setUpdateTime(now);
}
--
Gitblit v1.9.3