From 99a1086e763ee8be458b8e450f4d36222263ade3 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 20 Jan 2024 14:06:03 +0800
Subject: [PATCH] 添加物业公司,新增物业公司账号

---
 src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
index f2f3053..470736d 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
@@ -21,6 +21,7 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.cache.SysCache;
 import org.springblade.common.node.TreeStringNode;
 import org.springblade.common.utils.NodeTreeUtil;
 import org.springblade.core.log.exception.ServiceException;
@@ -136,11 +137,9 @@
 	 */
 	@Override
 	public List<TreeStringNode> getTree(RegionVO region) {
-		Dept dept = deptService.getById(AuthUtil.getDeptId());
-		if (null != dept) {
-			region.setRegionCode(dept.getRegionCode());
-		}
-		return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region));
+		List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+		Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+		return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region,regionChildCodesList,isAdministrator));
 	}
 
 	/**

--
Gitblit v1.9.3