From ad0bc4e763fa988a2ec4dd8dfab7381ea7726021 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 06 Jan 2024 17:46:48 +0800
Subject: [PATCH] 区划树查询修改
---
src/main/java/org/springblade/modules/system/mapper/RegionMapper.java | 3 +--
src/main/java/org/springblade/modules/system/vo/RegionVO.java | 2 ++
src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml | 21 ++++++++++++++++-----
src/main/java/org/springblade/modules/system/service/IRegionService.java | 4 ++--
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml | 4 ++--
src/main/java/org/springblade/modules/system/controller/RegionController.java | 6 +++---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 10 +++++-----
8 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
index 40f08e1..6c72b46 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
@@ -39,10 +39,10 @@
and jgwl.person_type = #{gridWorkLog.personType}
</if>
<if test="gridWorkLog.name !=null and gridWorkLog.name!=''">
- and jgwl.name like concat('%',#{gridWorkLog.name},'%')
+ and jh.name like concat('%',#{gridWorkLog.name},'%')
</if>
<if test="gridWorkLog.phone !=null and gridWorkLog.phone!=''">
- and jgwl.phone like concat('%',#{gridWorkLog.phone},'%')
+ and jh.phone_number like concat('%',#{gridWorkLog.phone},'%')
</if>
<if test="gridWorkLog.townName!=null and gridWorkLog.townName!=''">
and jda.town_street_name like concat('%',#{gridWorkLog.townName},'%')
diff --git a/src/main/java/org/springblade/modules/system/controller/RegionController.java b/src/main/java/org/springblade/modules/system/controller/RegionController.java
index 7d061e0..7d3778a 100644
--- a/src/main/java/org/springblade/modules/system/controller/RegionController.java
+++ b/src/main/java/org/springblade/modules/system/controller/RegionController.java
@@ -124,13 +124,13 @@
/**
* 树列表
- * @param parentCode
+ * @param region
* @return
*/
@GetMapping("/tree")
@ApiOperation(value = "树列表", notes = "传入menu")
- public R getTree(String parentCode) {
- return R.data(regionService.getTree(parentCode));
+ public R getTree(RegionVO region) {
+ return R.data(regionService.getTree(region));
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java
index fa593e0..21b1bfc 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java
@@ -68,8 +68,7 @@
* @return
*/
@MapKey(value = "id")
- Map<String, TreeStringNode> getTreeList(@Param("parentCode") String parentCode,
- @Param("regionCode") String regionCode);
+ Map<String, TreeStringNode> getTreeList(@Param("region") RegionVO region);
/**
* 树列表(获取当前树）
diff --git a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
index fd473e7..d418cbb 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
@@ -104,16 +104,27 @@
<!--根据父编号查询所有的下级-->
<select id="getTreeList" resultType="org.springblade.common.node.TreeStringNode">
+ <if test="region.cityCode!=null and region.cityCode!=''">
+ SELECT
+ code as id,
+ parent_code as parentId,
+ name
+ FROM blade_region
+ where code = #{region.cityCode}
+ union all
+ </if>
SELECT
code as id,
parent_code as parentId,
name
- FROM blade_region where district_code = '361102'
- <if test="parentCode!=null">
- and parent_code = #{parentCode}
+ FROM blade_region
+ where 1=1
+ and district_code = '361102'
+ <if test="region.parentCode!=null and region.parentCode!=''">
+ and parent_code = #{region.parentCode}
</if>
- <if test="regionCode!=null and regionCode!=''">
- and code like concat('%',#{regionCode},'%')
+ <if test="region.regionCode!=null and region.regionCode!=''">
+ and code like concat('%',#{region.regionCode},'%')
</if>
</select>
diff --git a/src/main/java/org/springblade/modules/system/service/IRegionService.java b/src/main/java/org/springblade/modules/system/service/IRegionService.java
index d25af47..832bf01 100644
--- a/src/main/java/org/springblade/modules/system/service/IRegionService.java
+++ b/src/main/java/org/springblade/modules/system/service/IRegionService.java
@@ -87,10 +87,10 @@
/**
* 树列表
- * @param parentCode
+ * @param region
* @return
*/
- List<TreeStringNode> getTree(String parentCode);
+ List<TreeStringNode> getTree(RegionVO region);
/**
* 树列表(获取当前树）
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index 68aac06..dcd401c 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -273,7 +273,7 @@
@Transactional(rollbackFor = Exception.class)
public Object dataHandle() {
// 查询未绑定的网格
- List<TreeStringNode> list = regionService.getTree("361102005");
+ List<TreeStringNode> list = regionService.getTree(null);
// 遍历
for (TreeStringNode treeStringNode : list) {
// 查询是否已创建
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..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));
}
/**
diff --git a/src/main/java/org/springblade/modules/system/vo/RegionVO.java b/src/main/java/org/springblade/modules/system/vo/RegionVO.java
index 3cbd1e5..ed42f88 100644
--- a/src/main/java/org/springblade/modules/system/vo/RegionVO.java
+++ b/src/main/java/org/springblade/modules/system/vo/RegionVO.java
@@ -86,4 +86,6 @@
}
return this.children;
}
+
+ private String regionCode;
}
--
Gitblit v1.9.3