es 搜索及数据初始化调整

zhongrj

2024-04-13 d5f77a020d823d64b8f6f7a6cc5a8432ee11b1ab

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

@@ -244,8 +244,22 @@
        jg.sort
        FROM blade_region br
        right join jczz_grid jg on jg.community_code = br.village_code and jg.is_deleted = 0
        where (br.ancestors like concat('%',#{regionCode},'%') or br.code = #{regionCode})
        where (br.ancestors like concat('%',#{regionCode},'%') or br.code = #{regionCode} or jg.grid_code = #{regionCode})
        )
    </select>

    <!--查询网格员对应的网格区域-->
    <select id="getGridRegionChildList" resultType="org.springblade.modules.system.entity.Region">
        SELECT
        jg.grid_code as code,
        jg.community_code as parent_code,
        jg.grid_name as name,
        '' as ancestors,
        6 as region_level,
        jg.sort
        FROM blade_region br
        right join jczz_grid jg on jg.community_code = br.village_code and jg.is_deleted = 0
        where jg.grid_code = #{regionCode}
    </select>

    <!--查询公安相关的区域数据-->
@@ -275,4 +289,39 @@
        WHERE is_deleted = 0  AND pcs_code IS NOT NULL
    </select>

    <!--查询当前文章范围对应的社区编号字符串集合-->
    <select id="getAllCommunityNameListString" resultType="java.lang.String">
        SELECT
        code
        FROM blade_region
        where
        <foreach collection="articleRange.split(',')" item="item" open="(" close=")" separator="OR">
            ancestors like concat('%',#{item},'%')
        </foreach>
        and region_level = 5
        union
        (
        SELECT
        br.code
        FROM jczz_district jd
        left join blade_region br on jd.community_code = br.village_code
        where br.region_level = 5
        and jd.id in
        <foreach collection="articleRange.split(',')" item="item" open="(" close=")" separator=",">
            #{item}
        </foreach>
        )
        union
        (
        SELECT
        jd.id
        FROM jczz_district jd
        where
        jd.id in
        <foreach collection="articleRange.split(',')" item="item" open="(" close=")" separator=",">
            #{item}
        </foreach>
        )
    </select>

</mapper>