Merge remote-tracking branch 'origin/master'

guoshilong

2024-01-18 1f869d1e5c9361645e7be28d2c27407d838a7d22

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

@@ -172,11 +172,7 @@
            AND jtrfr.phone like concat('%',#{vo.phone},'%')
        </if>
        <if test="vo.confirmFlag != null">
            AND (jtrfr.confirm_flag = #{vo.confirmFlag}
            <if test="vo.confirmUserId != null and vo.roleName!='网格员'">
                or jtrfr.confirm_user_id = #{vo.confirmUserId}
            </if>
            )
            AND jtrfr.confirm_flag = #{vo.confirmFlag}
        </if>

        <if test="vo.status != null">