Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

@@ -5,7 +5,13 @@
    <!--自定义分页查询-->
    <select id="selectGridPage" resultType="org.springblade.modules.grid.vo.GridVO">
        select
        jg.id,jg.community_code,jg.grid_name,jg.principal,jg.principal_phone,jg.remark,
        jg.id,
        jg.community_code,
        jg.grid_name,
        jg.grid_code,
        jg.principal,
        jg.principal_phone,
        jg.remark,
        br.name as communityName,br.town_name as townName
        from jczz_grid jg
        left join blade_region br on br.code = jg.community_code
@@ -18,6 +24,9 @@
        </if>
        <if test="grid.principal!=null and grid.principal!=''">
            and jg.principal like concat('%',#{grid.principal},'%')
        </if>
        <if test="grid.gridCode!=null and grid.gridCode!=''">
            and jg.grid_code like concat('%',#{grid.gridCode},'%')
        </if>
        <if test="grid.principalPhone!=null and grid.principalPhone!=''">
            and jg.principal_phone like concat('%',#{grid.principalPhone},'%')
@@ -41,6 +50,7 @@
        <if test="grid.townName != null and grid.townName !='' ">
            and br.town_name like concat('%',#{grid.townName},'%')
        </if>
        order by community_code asc,grid_code asc
    </select>

    <!--根据地址编号查询网格数据-->
@@ -53,7 +63,7 @@
        left join blade_user bu on bu.id = jgm.user_id and bu.is_deleted = 0
        left join blade_region br ON br.code = jg.community_code
        where jg.is_deleted = 0
        and jp.house_code = #{houseCode}
        and jp.house_code like concat('%',#{houseCode},'%')
        limit 1
    </select>

@@ -64,6 +74,9 @@
        left join jczz_gridman jgm on jgm.grid_id = jg.id and jgm.is_deleted = 0
        where 1=1
        and jgm.user_id = #{userId}
        <if test="addressCode!=null and addressCode!=''">
            and jgr.house_code = #{addressCode}
        </if>
    </select>

    <!--判断该小区点在哪个派出所-->
@@ -103,7 +116,7 @@

    <!--查询全部-->
    <select id="selectGridAll" resultType="org.springblade.modules.grid.entity.GridEntity">
        select id,community_code,grid_name,principal,principal_phone,remark,sort from jczz_grid
        select id,grid_code,community_code,grid_name,principal,principal_phone,remark,sort from jczz_grid
         where is_deleted = 0
    </select>

@@ -191,4 +204,12 @@
        and br.name = #{communityName}
    </select>

    <!--查询用户对应的网格-->
    <select id="getGridListByUserId" resultType="java.lang.String">
        select jg.grid_code from jczz_grid jg
        left join jczz_gridman jgm on jgm.grid_code = jg.grid_code and jgm.is_deleted = 0
        where jg.is_deleted = 0
        and jgm.user_id = #{userId}
    </select>

</mapper>