From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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..dd2e9cb 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));
}
/**
@@ -155,8 +154,8 @@
String regionCode = null;
if (null != dept) {
regionCode = dept.getRegionCode();
- if (StringUtils.isNotBlank(regionCode) && regionCode.equals("361100000000")) {
- regionCode = "361102000000";
+ if (StringUtils.isNotBlank(regionCode) && regionCode.equals("361100")) {
+ regionCode = "361102";
}
}
return NodeTreeUtil.getStringNodeTree(baseMapper.getTownTree(regionCode));
@@ -216,12 +215,12 @@
}
/**
- * 查询下级区域
+ * 查询下级区域(拼接网格)
* @param regionCode
* @return
*/
@Override
public List<Region> getRegionChild(String regionCode) {
- return baseMapper.selectList(Wrappers.<Region>query().lambda().like(Region::getAncestors, regionCode));
+ return baseMapper.getRegionChildList(regionCode);
}
}
--
Gitblit v1.9.3