From 413bbb8dbcb2a75ac28850b95aac2d16faf27b7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 18 Jan 2024 09:59:52 +0800
Subject: [PATCH] 议事管理bug
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 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 30cd13c..2c3709b 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,7 +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.springblade.common.node.TreeLongNode;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.log.exception.ServiceException;
@@ -27,7 +27,6 @@
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;
@@ -130,21 +129,22 @@
/**
* 树列表
- * @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();
+ if (null != dept) {
+ region.setRegionCode(dept.getRegionCode());
}
- return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(parentCode,regionCode));
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region));
}
/**
* 树列表(获取当前树）
+ *
* @param code
* @return
*/
@@ -152,9 +152,22 @@
public List<TreeStringNode> getTownTree(String code) {
Dept dept = deptService.getById(AuthUtil.getDeptId());
String regionCode = null;
- if (null!=dept){
+ if (null != dept) {
regionCode = dept.getRegionCode();
+ if (StringUtils.isNotBlank(regionCode) && regionCode.equals("3611")) {
+ regionCode = "361102";
+ }
}
return NodeTreeUtil.getStringNodeTree(baseMapper.getTownTree(regionCode));
}
+
+ /**
+ * 树列表(包含省市县三级)
+ *
+ * @return
+ */
+ @Override
+ public List<TreeStringNode> getBaseTree() {
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getBaseTree());
+ }
}
--
Gitblit v1.9.3