From 77fea47f1fa683f9a0356df3d2328e2bb68b28cf Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 18 Jan 2024 17:56:22 +0800
Subject: [PATCH] 数据过滤调整

---
 src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java b/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
index e277f60..319c1e0 100644
--- a/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
+++ b/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
@@ -21,6 +21,7 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.logging.log4j.util.Strings;
 import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
+import org.springblade.common.cache.SysCache;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.modules.grid.entity.GridEntity;
@@ -60,19 +61,11 @@
 	@Autowired
 	private IGridService gridService;
 
-	@Autowired
-	private IRegionService regionService;
-
-	@Autowired
-	private IDeptService deptService;
-
 	@Override
 	public IPage<GridmanVO> selectGridmanPage(IPage<GridmanVO> page, GridmanVO gridman) {
-		Dept dept = deptService.getById(AuthUtil.getDeptId());
-		if (null!=dept){
-			gridman.setRegionCode(dept.getRegionCode());
-		}
-		return page.setRecords(baseMapper.selectGridmanPage(page, gridman));
+		List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+		Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+		return page.setRecords(baseMapper.selectGridmanPage(page, gridman,regionChildCodesList,isAdministrator));
 	}
 
 	/**

--
Gitblit v1.9.3