Merge remote-tracking branch 'origin/master'

linwei

2024-01-22 8bbcf203caac16c26ef879e0d85ceed1c6f061f4

 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml

@@ -63,16 +63,22 @@
        <if test="place.isPerfect==2">
            and jp.status = 2
        </if>
        <if test="houseCodeList != null and houseCodeList.size()>0">
            and jp.house_code in
            <foreach collection="houseCodeList" item="houseCode" separator ="," open="("  close=")">
                #{houseCode}
            </foreach>
        </if>
        <if test="isAdministrator==2">
            <choose>
                <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                    and jg.community_code in
                    and jg.grid_code in
                    <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                        #{code}
                    </foreach>
                </when>
                <otherwise>
                    and jg.community_code in ('')
                    and jg.grid_code in ('')
                </otherwise>
            </choose>
        </if>
@@ -87,8 +93,7 @@
               br.name neiName,
               FALSE         AS   hasChildren
        FROM jczz_place jp
                 LEFT JOIN jczz_grid_range jgr ON jp.house_code = jgr.house_code
                 LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id
                 LEFT JOIN jczz_grid jg on jp.grid_code = jg.grid_code and jg.is_deleted = 0
                 LEFT JOIN blade_region br on br.code = jg.community_code
        where 1 = 1
          and jp.is_deleted = 0