Merge remote-tracking branch 'origin/master'

guoshilong

2024-01-18 1f869d1e5c9361645e7be28d2c27407d838a7d22

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

@@ -174,9 +174,7 @@
        <if test="vo.confirmFlag != null">
            AND jtrfr.confirm_flag = #{vo.confirmFlag}
        </if>
        <if test="vo.confirmUserId != null and vo.roleName!='网格员'">
            AND jtrfr.confirm_user_id = #{vo.confirmUserId}
        </if>

        <if test="vo.status != null">
            AND jtrfr.status = #{vo.status}
        </if>
@@ -264,6 +262,10 @@
        WHERE is_deleted = 0
        <if test="userId != null">
            and create_user = #{userId}

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