Merge remote-tracking branch 'origin/master'

linwei

2024-01-02 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d

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

@@ -113,7 +113,7 @@
            and parent_code = #{parentCode}
        </if>
        <if test="regionCode!=null and regionCode!=''">
            and parent_code = #{regionCode}
            and code like concat('%',#{regionCode},'%')
        </if>
    </select>

@@ -140,4 +140,14 @@
        </if>
    </select>

    <!--树列表(包含省市县三级)-->
    <select id="getBaseTree" resultType="org.springblade.common.node.TreeStringNode">
        SELECT
        code as id,
        parent_code as parentId,
        name
        FROM blade_region
        where region_level >0 and region_level &lt;4
    </select>

</mapper>