From 7941db00ace2a95cf5d65b51d7ad600c225b2eda Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 18:06:26 +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, 7 insertions(+), 0 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 7229c91..2965cdb 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
@@ -16,6 +16,7 @@
  */
 package org.sxkj.gd.orderdata.service.impl;
 
+import org.springblade.core.secure.utils.AuthUtil;
 import org.sxkj.gd.orderdata.entity.GdDataEvaluationEntity;
 import org.sxkj.gd.orderdata.param.GdDataEvaluationPageParam;
 import org.sxkj.gd.orderdata.vo.GdDataEvaluationVO;
@@ -26,6 +27,8 @@
 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;
 
 /**
@@ -39,6 +42,10 @@
 
 	@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);
+		}
 		return page.setRecords(baseMapper.selectGdDataEvaluationPage(page, gdDataEvaluation));
 	}
 

--
Gitblit v1.9.3