From f789ce14f7b7790f20fc4894eacdf452b7228497 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 04 Feb 2026 14:10:28 +0800
Subject: [PATCH] 反无驾驶舱优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 d6f6e5d..48c4f1c 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
@@ -57,8 +57,10 @@
@Override
public IPage<FwAreaDivideVO> selectFwAreaDividePage(IPage<FwAreaDivideVO> page, FwAreaDivideDTO fwAreaDivide) {
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
- fwAreaDivide.setDeptList(deptList);
+ if (!AuthUtil.isAdministrator()) {
+ List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ fwAreaDivide.setDeptList(deptList);
+ }
fwAreaDivide.setAreaTypeKeyList(parseAreaTypeKeyList(fwAreaDivide.getAreaTypeKeys()));
List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDividePage(page, fwAreaDivide);
@@ -82,7 +84,10 @@
param.setFlyTime(flyTime);
// 解析区域类型键值列表
param.setAreaTypeKeyList(parseAreaTypeKeyList(areaTypeKeys));
-
+ if (!AuthUtil.isAdministrator()) {
+ List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ param.setDeptList(deptList);
+ }
// 调用Mapper方法，传入参数对象
List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDivideList(param);
// 获取面数据
@@ -230,8 +235,10 @@
@Override
public IPage<FwAreaDivideStatisticsVO> selectFwAreaDivideStatisticsPage(IPage<FwAreaDivideStatisticsVO> page,
FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
- fwAreaDivideStatistics.setDeptList(deptList);
+ if (!AuthUtil.isAdministrator()) {
+ List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ fwAreaDivideStatistics.setDeptList(deptList);
+ }
fwAreaDivideStatistics.setAreaTypeKeyList(parseAreaTypeKeyList(fwAreaDivideStatistics.getAreaTypeKeys()));
return page.setRecords(baseMapper.selectFwAreaDivideStatisticsPage(page, fwAreaDivideStatistics));
}
--
Gitblit v1.9.3