From e67a8a7477096a295d65afa1c366d2b59f8752fc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Feb 2024 14:20:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 12 +++++++-----
1 files changed, 7 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 b7efe4c..07637de 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
@@ -162,12 +162,14 @@
*/
@Override
public List<TreeStringNode> getTownTree(String code) {
- Dept dept = deptService.getById(AuthUtil.getDeptId());
String regionCode = null;
- if (null != dept) {
- regionCode = dept.getRegionCode();
- if (StringUtils.isNotBlank(regionCode) && regionCode.equals("361100")) {
- regionCode = "361102";
+ if (!AuthUtil.isAdministrator() && !AuthUtil.isAdmin()){
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null != dept) {
+ regionCode = dept.getRegionCode();
+ if (StringUtils.isNotBlank(regionCode) && regionCode.equals("361100")) {
+ regionCode = "361102";
+ }
}
}
return NodeTreeUtil.getStringNodeTree(baseMapper.getTownTree(regionCode));
--
Gitblit v1.9.3