Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

@@ -466,7 +466,7 @@
    <!--取保候审人员查询-->
    <select id="getBailReportingPage" resultType="org.springblade.modules.task.vo.TaskVO">
        SELECT
        IFNULL( jda.address_name, jp.location ) AS address_name,
        IFNULL( jda.address_name, jh.house_name ) AS address_name,
        jtbre.apply_name,
        jh.district_code aoiCode,
        jda.region_code,
@@ -522,7 +522,7 @@
            </if>

            <if test="task.aoiCode != null and task.aoiCode != null">
                and jgr.district_code = #{task.aoiCode}
                and jh.district_code = #{task.aoiCode}
            </if>

            <if test="task.neiCode != null and task.neiCode != null">