From f0ad850a7a962dcf53c6c88e31de4bc2b1e20457 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 13 Jan 2026 15:18:16 +0800
Subject: [PATCH] 设备和区域场景list 过滤时增加id返回已绑定的子数据
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java
index 013c879..f8b71c5 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java
@@ -49,8 +49,8 @@
}
@Override
- public List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected) {
- return baseMapper.selectFwAreaDivideList(filterSelected);
+ public List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId) {
+ return baseMapper.selectFwAreaDivideList(filterSelected, sceneId);
}
@Override
@@ -111,19 +111,19 @@
deptId = null;
}
}
- String areaCode = fwAreaDivide.getAreaCode();
- if (StringUtil.isBlank(areaCode)) {
- areaCode = HeaderUtils.getAreaCode();
- }
+// String areaCode = fwAreaDivide.getAreaCode();
+// if (StringUtil.isBlank(areaCode)) {
+// areaCode = HeaderUtils.getAreaCode();
+// }
Date now = new Date();
fwAreaDivide.setCreateUser(userId);
fwAreaDivide.setUpdateUser(userId);
if (deptId != null) {
fwAreaDivide.setCreateDept(deptId);
}
- if (StringUtil.isNotBlank(areaCode)) {
- fwAreaDivide.setAreaCode(areaCode);
- }
+// if (StringUtil.isNotBlank(areaCode)) {
+// fwAreaDivide.setAreaCode(areaCode);
+// }
fwAreaDivide.setCreateTime(now);
fwAreaDivide.setUpdateTime(now);
}
--
Gitblit v1.9.3