From b7df6735bcb2d447cae7fcfba2d12accf3dd2fcc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 17:27:21 +0800
Subject: [PATCH] 消防检查优化
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 26 +++++++++++++++++---------
1 files changed, 17 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..938b5ce 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;
@@ -34,6 +35,7 @@
import org.springblade.modules.system.mapper.RegionMapper;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRegionService;
+import org.springblade.modules.system.vo.RegionParamVO;
import org.springblade.modules.system.vo.RegionVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -135,12 +137,18 @@
* @return
*/
@Override
- public List<TreeStringNode> getTree(RegionVO region) {
- Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null != dept) {
- region.setRegionCode(dept.getRegionCode());
+ public List<TreeStringNode> getTree(RegionParamVO region) {
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+ if (null!=region.getDeptNature()){
+ // 公安
+ if (region.getDeptNature()==1){
+ // 查询公安对应的辖区树
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getPoliceTreeList());
+ }
}
- return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region));
+ // 非公安
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region,regionChildCodesList,isAdministrator));
}
/**
@@ -155,8 +163,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 +224,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