From 4f20a60bd9cbcf3febb29ffcbd39ed93b38ae67e Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 09 Feb 2026 19:15:44 +0800
Subject: [PATCH] 应用创新
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataEvaluationServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataEvaluationServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataEvaluationServiceImpl.java
index 0028f7d..5537e6c 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataEvaluationServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataEvaluationServiceImpl.java
@@ -43,12 +43,15 @@
@Override
public IPage<GdDataEvaluationVO> selectGdDataEvaluationPage(IPage<GdDataEvaluationVO> page, GdDataEvaluationPageParam gdDataEvaluation) {
- if(gdDataEvaluation.getIsQueryAll()){
- List<Long> deptList = new ArrayList<>();
- if (!AuthUtil.isAdministrator()) {
- deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ if (!AuthUtil.isAdministrator()) {
+ if (!gdDataEvaluation.getIsQueryAll()) {
+ List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ gdDataEvaluation.setDeptList(deptList);
}
- gdDataEvaluation.setDeptList(deptList);
+ } else {
+ // 管理员角色下保留原有分页信息，仅清空查询条件
+ gdDataEvaluation.setDeptList(null);
+ gdDataEvaluation.setIsQueryAll(true);
}
return page.setRecords(baseMapper.selectGdDataEvaluationPage(page, gdDataEvaluation));
}
@@ -57,7 +60,7 @@
@Override
public List<GdDataEvaluationExcel> exportGdDataEvaluation(Wrapper<GdDataEvaluationEntity> queryWrapper) {
List<GdDataEvaluationExcel> gdDataEvaluationList = baseMapper.exportGdDataEvaluation(queryWrapper);
- //gdDataEvaluationList.forEach(gdDataEvaluation -> {
+ // gdDataEvaluationList.forEach(gdDataEvaluation -> {
// gdDataEvaluation.setTypeName(DictCache.getValue(DictEnum.YES_NO, GdDataEvaluation.getType()));
//});
return gdDataEvaluationList;
--
Gitblit v1.9.3