From 20188836c020eaedf09aeed878cb6b1cc96bbe68 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 19 Jan 2024 16:47:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml | 27 +++++++++++++++++++--------
src/main/java/org/springblade/common/node/TreeStringNode.java | 5 +++++
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/common/node/TreeStringNode.java b/src/main/java/org/springblade/common/node/TreeStringNode.java
index 9636f8f..6135109 100644
--- a/src/main/java/org/springblade/common/node/TreeStringNode.java
+++ b/src/main/java/org/springblade/common/node/TreeStringNode.java
@@ -65,6 +65,11 @@
private Integer relationship;
/**
+ * 排序
+ */
+ private Integer sort;
+
+ /**
* 父节点ID
*/
@JsonSerialize(using = ToStringSerializer.class)
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 ea9370a..60f6972 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
@@ -105,18 +105,29 @@
<!--根据父编号查询所有的下级-->
<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
+ SELECT
+ code as id,
+ parent_code as parentId,
+ name,
+ sort
+ FROM blade_region
+ where code = #{region.cityCode}
+ union all
+ select
+ grid_code as id,
+ community_code as parentId,
+ grid_name as name,
+ jg.sort
+ FROM jczz_grid jg
+ left join blade_region br on br.village_code = jg.community_code and br.region_level = 5
+ where jg.is_deleted = 0 and br.city_code = #{region.cityCode}
+ union all
</if>
SELECT
code as id,
parent_code as parentId,
- name
+ name,
+ sort
FROM blade_region
where 1=1
and district_code = '361102000000'
--
Gitblit v1.9.3