议事管理bug

linwei

2024-01-17 4ec472d8828e34fbcfb3990451d059e486b7d5ea

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

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

        <if test="vo.status != null">
            AND jtrfr.status = #{vo.status}
        </if>
        <if test="vo.addressCode != null">
            AND jtrfr.address_code = #{vo.addressCode}
        </if>
        <if test="vo.viewType != null">
            AND jtrfr.view_type = #{vo.viewType}
@@ -187,19 +192,21 @@
            AND jtrfr.create_time BETWEEN #{vo.startTime} and #{vo.endTime}
        </if>
        <if test="vo.regionCode != null and vo.regionCode !='' ">
            and jg.community_code like concat('%',#{vo.regionCode},'%')
            and jg.community_code like concat(#{vo.regionCode},'%')
        </if>
        <if test="vo.roleName!=null and vo.roleName!=''">
            <if test="vo.roleName=='网格员'">
                <choose>
                    <when test="list != null and list.size()>0">
                        and jda.address_code in
                        <foreach collection="list" item="houseCode" separator ="," open="("  close=")">
                        and (jda.address_code in
                        <foreach collection="list" item="houseCode" separator="," open="(" close=")">
                            #{houseCode}
                        </foreach>
                        or jtrfr.confirm_user_id = #{vo.confirmUserId})
                    </when>
                    <otherwise>
                        and jda.address_code in ('')
                        and (jda.address_code in ('')
                        or jtrfr.confirm_user_id = #{vo.confirmUserId})
                    </otherwise>
                </choose>
            </if>
@@ -259,6 +266,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>