Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-01 9088fae65c0e433b21fd56351d0e1dc8e76debeb

 ard-work/src/main/resources/mapper/management3d/ArdTiles3dMapper.xml

@@ -74,7 +74,9 @@
            <if test="dynamicScreenSpaceErrorDensity != null ">and c.dynamic_screen_space_error_density =
                #{dynamicScreenSpaceErrorDensity}
            </if>
            <if test="deptId != null ">and c.dept_id = #{deptId}</if>
            <if test="deptId != null ">and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t
                WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
            </if>
            <if test="userId != null  and userId != ''">and c.user_id = #{userId}</if>
        </where>
        <!-- 数据范围过滤 -->