Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

@@ -232,7 +232,7 @@
                    or jtrfr.confirm_user_id = #{vo.confirmUserId}
                </if>
            </if>
            <!-- 网格员及其他 -->
            <!-- 其他 -->
            <if test="vo.roleType ==null">
                <choose>
                    <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
@@ -249,7 +249,9 @@
                        )
                    </when>
                </choose>

            </if>
            <!-- 网格员 -->
            <if test="vo.roleName =='wgy'">
                <choose>
                    <when test="gridCodeList !=null and gridCodeList.size()>0">
                        and (
@@ -257,7 +259,7 @@
                        <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
                            #{code}
                        </foreach>
                            or
                        or
                        jp.grid_code in
                        <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
                            #{code}
@@ -272,7 +274,6 @@
                <if test="vo.confirmUserId != null ">
                    or jtrfr.confirm_user_id = #{vo.confirmUserId}
                </if>

            </if>
        </if>
        ORDER BY jtrfr.create_time DESC