From 1feb2a3861fa66b2f40e9f323d1fb44fe5982ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Wed, 27 Aug 2025 17:54:05 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=B8=8E=E9=83=A8=E9=97=A8=20=E6=9C=AA=E5=81=9A=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/system/mapper/SysDeptMapper.java | 8 ++++++-- .../org/dromara/system/mapper/SysMenuMapper.java | 12 +++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java index 196eefb3c..1f93c5030 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java @@ -30,7 +30,9 @@ public interface SysDeptMapper extends BaseMapperPlus { */ default String buildDeptByRoleSql(Long roleId) { return """ - select dept_id from sys_role_dept where role_id = %d + select srd.dept_id from sys_role_dept srd + left join sys_role sr on sr.role_id = srd.role_id + where srd.role_id = %d and sr.status = 0 """.formatted(roleId); } @@ -47,7 +49,9 @@ public interface SysDeptMapper extends BaseMapperPlus { default String buildParentDeptByRoleSql(Long roleId) { return """ select parent_id from sys_dept where dept_id in ( - select dept_id from sys_role_dept where role_id = %d + select srd.dept_id from sys_role_dept srd + left join sys_role sr on sr.role_id = srd.role_id + where srd.role_id = %d and sr.status = 0 ) """.formatted(roleId); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java index 10bc015f2..b0903057c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java @@ -32,7 +32,9 @@ public interface SysMenuMapper extends BaseMapperPlus { default String buildMenuByUserSql(Long userId) { return """ select menu_id from sys_role_menu where role_id in ( - select role_id from sys_user_role where user_id = %d + select sur.role_id from sys_user_role sur + left join sys_role sr on sr.role_id = sur.role_id + where sur.user_id = %d and sr.status = 0 ) """.formatted(userId); } @@ -50,7 +52,9 @@ public interface SysMenuMapper extends BaseMapperPlus { */ default String buildMenuByRoleSql(Long roleId) { return """ - select menu_id from sys_role_menu where role_id = %d + select srm.menu_id from sys_role_menu srm + left join sys_role sr on sr.role_id = srm.role_id + where srm.role_id = %d and sr.status = 0 """.formatted(roleId); } @@ -68,7 +72,9 @@ public interface SysMenuMapper extends BaseMapperPlus { default String buildParentMenuByRoleSql(Long roleId) { return """ select parent_id from sys_menu where menu_id in ( - select menu_id from sys_role_menu where role_id = %d + select srm.menu_id from sys_role_menu srm + left join sys_role sr on sr.role_id = srm.role_id + where srm.role_id = %d and sr.status = 0 ) """.formatted(roleId); }