Merge remote-tracking branch 'origin/master'

linwei

2024-01-19 20188836c020eaedf09aeed878cb6b1cc96bbe68

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/common/node/TreeStringNode.java

@@ -65,6 +65,11 @@
    private Integer relationship;

    /**
     * 排序
     */
    private Integer sort;

    /**
     * 父节点ID
     */
    @JsonSerialize(using = ToStringSerializer.class)

 src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml

@@ -108,15 +108,26 @@
            SELECT
            code as id,
            parent_code as parentId,
            name
        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'