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 | 16 +++++++++++-----
1 files changed, 11 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 8df3164..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
@@ -16,7 +16,9 @@
*/
package org.sxkj.fw.detection.service.impl;
+import org.springblade.core.secure.utils.AuthUtil;
import org.sxkj.fw.detection.entity.FwEffectEvalEntity;
+import org.sxkj.fw.detection.param.FwEffectEvalParam;
import org.sxkj.fw.detection.vo.FwEffectEvalVO;
import org.sxkj.fw.detection.excel.FwEffectEvalExcel;
import org.sxkj.fw.detection.mapper.FwEffectEvalMapper;
@@ -25,19 +27,26 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
+import org.sxkj.system.cache.SysCache;
+
import java.util.List;
/**
* 反制效果评估表 服务实现类
*
* @author BladeX
- * @since 2026-01-07
+ * @since 2026-01-08
*/
@Service
public class FwEffectEvalServiceImpl extends BaseServiceImpl<FwEffectEvalMapper, FwEffectEvalEntity> implements IFwEffectEvalService {
@Override
- public IPage<FwEffectEvalVO> selectFwEffectEvalPage(IPage<FwEffectEvalVO> page, FwEffectEvalVO fwEffectEval) {
+ public IPage<FwEffectEvalVO> selectFwEffectEvalPage(IPage<FwEffectEvalVO> page, FwEffectEvalParam fwEffectEval) {
+ 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));
}
@@ -45,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