Merge remote-tracking branch 'origin/master'

zhongrj

2024-02-07 3a5ea5a84c338e0cb7a942e03a98e883a0b23115

 src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml

@@ -397,7 +397,6 @@

    <select id="export"
            resultMap="TaskPlaceRectificationExcelResult">

        SELECT
        jtpr.id,
        jtpr.place_check_id,
@@ -516,7 +515,7 @@
                            #{code}
                        </foreach>
                        or
                        jpag.community_code in
                        br.village_code in
                        <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                            #{code}
                        </foreach>
@@ -525,14 +524,13 @@
                    <otherwise>
                        and
                        (
                        jg.grid_code in ('') or jpag.community_code in ('')
                        jg.grid_code in ('') or br.village_code in ('')
                        )
                    </otherwise>
                </choose>
            </if>
        </where>


        order by jtpr.create_time desc
    </select>