From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 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 30cd13c..89ce8dd 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
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.logging.log4j.util.Strings;
import org.springblade.common.node.TreeLongNode;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.NodeTreeUtil;
@@ -130,17 +131,16 @@
/**
* 树列表
- * @param parentCode
+ * @param region
* @return
*/
@Override
- public List<TreeStringNode> getTree(String parentCode) {
+ public List<TreeStringNode> getTree(RegionVO region) {
Dept dept = deptService.getById(AuthUtil.getDeptId());
- String regionCode = null;
if (null!=dept){
- regionCode = dept.getRegionCode();
+ region.setRegionCode(dept.getRegionCode());
}
- return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(parentCode,regionCode));
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region));
}
/**
@@ -157,4 +157,13 @@
}
return NodeTreeUtil.getStringNodeTree(baseMapper.getTownTree(regionCode));
}
+
+ /**
+ * 树列表(包含省市县三级)
+ * @return
+ */
+ @Override
+ public List<TreeStringNode> getBaseTree() {
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getBaseTree());
+ }
}
--
Gitblit v1.9.3