Merge remote-tracking branch 'origin/master'

linwei

2024-01-19 f3dac2f82e3a6e2836a15a66df4bafd4f5cfd733

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

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