From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15: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