From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwEffectEvalServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwEffectEvalServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwEffectEvalServiceImpl.java
index 9783f40..5e98e79 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwEffectEvalServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwEffectEvalServiceImpl.java
@@ -42,8 +42,10 @@
@Override
public IPage<FwEffectEvalVO> selectFwEffectEvalPage(IPage<FwEffectEvalVO> page, FwEffectEvalParam fwEffectEval) {
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
- fwEffectEval.setDeptList(deptList);
+ if (!AuthUtil.isAdministrator()) {
+ List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ fwEffectEval.setDeptList(deptList);
+ }
fwEffectEval.setCurrentDeptId(AuthUtil.getDeptId());
return page.setRecords(baseMapper.selectFwEffectEvalPage(page, fwEffectEval));
}
@@ -52,9 +54,6 @@
@Override
public List<FwEffectEvalExcel> exportFwEffectEval(Wrapper<FwEffectEvalEntity> queryWrapper) {
List<FwEffectEvalExcel> fwEffectEvalList = baseMapper.exportFwEffectEval(queryWrapper);
- //fwEffectEvalList.forEach(fwEffectEval -> {
- // fwEffectEval.setTypeName(DictCache.getValue(DictEnum.YES_NO, FwEffectEval.getType()));
- //});
return fwEffectEvalList;
}
--
Gitblit v1.9.3