Merge remote-tracking branch 'origin/master'

rain

2026-02-09 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb

 drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RegionMapper.xml

@@ -101,8 +101,18 @@
    </select>

    <select id="exportRegion" resultType="org.sxkj.system.excel.RegionExcel">
        SELECT *
        FROM blade_region ${ew.customSqlSegment}
        SELECT
            *
        FROM
            blade_region
        <where>
            <if test="regionIds!=null and regionIds.size()>0">
                and id in
                <foreach item="item" index="index" collection="regionIds" open="(" separator="," close=")">
                    #{item}
                </foreach>
            </if>
        </where>
    </select>

    <!--查询parentCode 长度少于12 的-->
@@ -125,7 +135,7 @@
            code,
            parent_code,
            ancestors,
            `name`,
            "name",
            province_code,
            province_name,
            city_code,
@@ -140,7 +150,7 @@
            type,
            sort,
            remark,
            `status`,
            "status",
            CASE
            WHEN
                region_level = '5' THEN town_name