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-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataEvaluationServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 2965cdb..09b2f26 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
@@ -29,6 +29,7 @@
import org.springblade.core.mp.base.BaseServiceImpl;
import org.sxkj.system.cache.SysCache;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -42,9 +43,16 @@
@Override
public IPage<GdDataEvaluationVO> selectGdDataEvaluationPage(IPage<GdDataEvaluationVO> page, GdDataEvaluationPageParam gdDataEvaluation) {
- if(gdDataEvaluation.getIsQueryAll()){
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
- gdDataEvaluation.setDeptList(deptList);
+ if (!AuthUtil.isAdministrator()) {
+ if (!gdDataEvaluation.getIsQueryAll()) {
+ List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ gdDataEvaluation.setDeptList(deptList);
+ }
+ } else {
+ // 管理员角色下保留原有分页信息，仅清空查询条件
+ gdDataEvaluation.setDeptList(null);
+ gdDataEvaluation.setIsQueryAll(true);
+ gdDataEvaluation.setIsResolved(null);
}
return page.setRecords(baseMapper.selectGdDataEvaluationPage(page, gdDataEvaluation));
}
@@ -53,7 +61,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