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 | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 9edd251..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
@@ -44,10 +44,15 @@
@Override
public IPage<GdDataEvaluationVO> selectGdDataEvaluationPage(IPage<GdDataEvaluationVO> page, GdDataEvaluationPageParam gdDataEvaluation) {
if (!AuthUtil.isAdministrator()) {
- if (gdDataEvaluation.getIsQueryAll()) {
+ 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));
}
--
Gitblit v1.9.3