From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管

---
 src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java b/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
index 4dfa1d4..8c8e791 100644
--- a/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
+++ b/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
@@ -30,6 +30,8 @@
 import org.springblade.modules.grid.service.IGridService;
 import org.springblade.modules.grid.vo.GridVO;
 import org.springblade.modules.property.service.IPropertyDistrictUserService;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,8 +51,15 @@
 	@Autowired
 	private IGridService gridService;
 
+	@Autowired
+	private IDeptService deptService;
+
 	@Override
 	public IPage<DistrictVO> selectDistrictPage(IPage<DistrictVO> page, DistrictVO district) {
+		Dept dept = deptService.getById(AuthUtil.getDeptId());
+		if (null!=dept){
+			district.setRegionCode(dept.getRegionCode());
+		}
 		List<DistrictVO> districtVOS = baseMapper.selectDistrictPage(page, district);
 		// 遍历
 		for (DistrictVO districtVO : districtVOS) {
@@ -77,7 +86,7 @@
 	 */
 	@Override
 	public Object getDistrictTree(DistrictVO district) {
-		String userRole = AuthUtil.getUserRole();
+		// String userRole = AuthUtil.getUserRole();
 		// if (userRole.equals("wygly")) {
 		// 	IPropertyDistrictUserService bean = SpringUtils.getBean(IPropertyDistrictUserService.class);
 		// 	List<String> strings = bean.selectPropertyDistrictByUserId(AuthUtil.getUserId());

--
Gitblit v1.9.3