From 9cc50d2e2c3fcfff3c6b95c09806d3881a97c5ff Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 15:20:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 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 dcfc5cf..fdfb6a9 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,15 +19,23 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.node.TreeLongNode;
+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;
@@ -43,6 +51,9 @@
*/
@Service
public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements IRegionService {
+
+ @Autowired
+ private IDeptService deptService;
@Override
public boolean submit(Region region) {
@@ -116,4 +127,43 @@
public List<RegionExcel> exportRegion(Wrapper<Region> queryWrapper) {
return baseMapper.exportRegion(queryWrapper);
}
+
+ /**
+ * 树列表
+ * @param parentCode
+ * @return
+ */
+ @Override
+ public List<TreeStringNode> getTree(String 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));
+ }
+
+ /**
+ * 树列表(包含省市县三级)
+ * @return
+ */
+ @Override
+ public List<TreeStringNode> getBaseTree() {
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getBaseTree());
+ }
}
--
Gitblit v1.9.3