居住证审核+从业人员优化

lin

2024-03-21 b5837609dcd4417904eaaa5924de46010443affd

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

@@ -49,7 +49,7 @@

            <if test="isAdministrator==2">
                <!-- 网格员及其他 -->
                <if test="vo.roleType ==null">
                <if test="residen.roleType ==null and residen.roleName !='inhabitant'">
                    <choose>
                        <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                            and (
@@ -58,7 +58,7 @@
                                #{code}
                            </foreach>
                            or
                            jp.grid_code in
                            jtrpa.jw_grid_code in
                            <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                                #{code}
                            </foreach>
@@ -73,20 +73,12 @@
                            <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
                                #{code}
                            </foreach>
                            or
                            jp.grid_code in
                            <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
                                #{code}
                            </foreach>
                            )
                        </when>
                        <otherwise>
                            and jg.grid_code in ('')
                        </otherwise>
                    </choose>

                    <if test="vo.confirmUserId != null ">
                        or jtrfr.confirm_user_id = #{vo.confirmUserId}
                    <if test="residen.confirmUserId != null ">
                        or jtrfr.confirm_user_id = #{residen.confirmUserId}
                    </if>

                </if>