From 9088fae65c0e433b21fd56351d0e1dc8e76debeb Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期三, 01 十一月 2023 15:25:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/resources/mapper/management3d/ArdTiles3dMapper.xml | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ard-work/src/main/resources/mapper/management3d/ArdTiles3dMapper.xml b/ard-work/src/main/resources/mapper/management3d/ArdTiles3dMapper.xml index adfbdcb..bfb5c73 100644 --- a/ard-work/src/main/resources/mapper/management3d/ArdTiles3dMapper.xml +++ b/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> <!-- 鏁版嵁鑼冨洿杩囨护 --> -- Gitblit v1.9.3