bug 修复

linwei

2024-01-19 494aeb58eb885b40ab2fdb083aaa79007bb79ae2

 src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml

@@ -22,8 +22,18 @@
        <if test="grid.principalPhone!=null and grid.principalPhone!=''">
            and jg.principal_phone like concat('%',#{grid.principalPhone},'%')
        </if>
        <if test="grid.regionCode != null and grid.regionCode !='' ">
            and jg.community_code like concat('%',#{grid.regionCode},'%')
        <if test="isAdministrator==2">
            <choose>
                <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                    and jg.community_code in
                    <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                        #{code}
                    </foreach>
                </when>
                <otherwise>
                    and jg.community_code in ('')
                </otherwise>
            </choose>
        </if>
        <if test="grid.communityName != null and grid.communityName !='' ">
            and br.name like concat('%',#{grid.communityName},'%')
@@ -66,15 +76,16 @@
        SELECT
            jg.id,
            jg.grid_name,
            jg.community_name,
            sort,
            br.name as community_name,
            jg.sort,
            bu.real_name AS realName,
            bu.phone AS gridPhone
        FROM
            jczz_grid jg
                LEFT JOIN jczz_gridman jgm on jg.id = jgm.grid_id
                LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
                LEFT JOIN jczz_place_rel jpr ON locate( jpr.community_name, jg.community_name )> 0
                LEFT JOIN blade_region br on br.code = jg.community_code
                LEFT JOIN jczz_place_rel jpr ON locate( jpr.community_name, br.name )> 0
                AND locate( jpr.grid_name, jg.grid_name )> 0
                AND jpr.is_deleted = 0
                LEFT JOIN blade_user bu ON bu.id = jgm.user_id
@@ -103,7 +114,7 @@
               parent_code as parentId,
               name
        FROM blade_region
        where district_code = '361102'
        where district_code = '361102000000'
        union all
        (select id,
                community_code as parentId,