Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml

@@ -39,8 +39,18 @@
        <if test="district.townStreetName !=null and district.townStreetName !=''">
            and br.town_name like concat('%',#{district.townStreetName},'%')
        </if>
        <if test="district.regionCode !=null and district.regionCode !=''">
            and jd.community_code like concat('%',#{district.regionCode},'%')
        <if test="isAdministrator==2">
            <choose>
                <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                    and jd.community_code in
                    <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                        #{code}
                    </foreach>
                </when>
                <otherwise>
                    and jd.community_code in ('')
                </otherwise>
            </choose>
        </if>
    </select>

@@ -51,7 +61,7 @@
        parent_code as parentId,
        name,
        remark aoiCode
        FROM blade_region where district_code = '361102'
        FROM blade_region where district_code = '361102000000'
        union all
        (
        select
@@ -61,7 +71,7 @@
        aoi_code aoiCode
        from jczz_district
        where is_deleted = 0
        <if test="district.districtIdList!=null and district.districtIdList!=''">
        <if test="district.districtIdList!=null and district.districtIdList.size() > 0">
            and id in
            <foreach collection="district.districtIdList" item="item" separator ="," open="("  close=")">
                #{item}