From 1edc8864e802f1e40cc25295cb1837dcb6c12065 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 11 Jan 2024 09:27:03 +0800
Subject: [PATCH] 街道查询,场所删除修改

---
 src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 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 fdfb6a9..5cb29d9 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));
 	}
 
 	/**
@@ -154,6 +154,9 @@
 		String regionCode = null;
 		if (null!=dept){
 			regionCode = dept.getRegionCode();
+			if (regionCode.equals("3611")){
+				regionCode = "361102";
+			}
 		}
 		return NodeTreeUtil.getStringNodeTree(baseMapper.getTownTree(regionCode));
 	}

--
Gitblit v1.9.3