民警网格区域查询合并，网格员区域树查询修改，解决不显示网格问题

zhongrj

2024-04-12 47712cc6cd4d52fcd1dde44e2a400ccbb9c6ae7a

 src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml

@@ -171,6 +171,10 @@
            AND jtrfr.create_user = #{vo.createUser}
        </if>

        <if test="vo.houseCode != null and vo.houseCode != ''">
            and jtrfr.address_code = #{vo.houseCode}
        </if>

        <if test="vo.streetName != null and vo.streetName != ''">
            AND br.town_name like concat('%',#{vo.streetName},'%')
        </if>
@@ -232,7 +236,7 @@
                    or jtrfr.confirm_user_id = #{vo.confirmUserId}
                </if>
            </if>
            <!-- 网格员及其他 -->
            <!-- 其他 -->
            <if test="vo.roleType ==null">
                <choose>
                    <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
@@ -249,7 +253,9 @@
                        )
                    </when>
                </choose>

            </if>
            <!-- 网格员 -->
            <if test="vo.roleName =='wgy'">
                <choose>
                    <when test="gridCodeList !=null and gridCodeList.size()>0">
                        and (
@@ -257,7 +263,7 @@
                        <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
                            #{code}
                        </foreach>
                            or
                        or
                        jp.grid_code in
                        <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
                            #{code}
@@ -272,7 +278,6 @@
                <if test="vo.confirmUserId != null ">
                    or jtrfr.confirm_user_id = #{vo.confirmUserId}
                </if>

            </if>
        </if>
        ORDER BY jtrfr.create_time DESC