From bd92c2ab5b7baee24cb8204a3856c9de188a4f97 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Dec 2023 21:53:18 +0800
Subject: [PATCH] 区域查询修改，场所，房屋，住户，租赁，网格信息区域过滤，机构新增区域字段
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 29f0e11..30cd13c 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
@@ -23,14 +23,19 @@
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
+import org.springblade.modules.district.vo.DistrictVO;
+import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.excel.RegionExcel;
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.RegionVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -46,6 +51,9 @@
*/
@Service
public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements IRegionService {
+
+ @Autowired
+ private IDeptService deptService;
@Override
public boolean submit(Region region) {
@@ -127,6 +135,26 @@
*/
@Override
public List<TreeStringNode> getTree(String parentCode) {
- return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(parentCode));
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ String regionCode = null;
+ if (null!=dept){
+ regionCode = dept.getRegionCode();
+ }
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(parentCode,regionCode));
+ }
+
+ /**
+ * 树列表(获取当前树）
+ * @param code
+ * @return
+ */
+ @Override
+ public List<TreeStringNode> getTownTree(String code) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ String regionCode = null;
+ if (null!=dept){
+ regionCode = dept.getRegionCode();
+ }
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getTownTree(regionCode));
}
}
--
Gitblit v1.9.3