Fix 修复 菜单与部门 未做角色状态判断

SERVER/VberAdminPlusV3/vber-modules/vber-system/src/main/java/com/vber/system/mapper/SysMenuMapper.java

@@ -35,7 +35,9 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenuVo> {
     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);
     }
@@ -72,7 +74,9 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenuVo> {
      */
     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);
     }
 
@@ -90,7 +94,9 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenuVo> {
     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);
     }

SERVER/VberAdminPlusV3/vber-modules/vber-system/src/main/java/com/vber/system/mapper/SysOrgMapper.java

@@ -34,7 +34,9 @@ public interface SysOrgMapper extends BaseMapperPlus<SysOrg, SysOrgVo> {
      */
     default String buildOrgByRoleSql(Long roleId) {
         return """
-                    select org_id from sys_role_org where role_id = %d
+                select sro.org_id from sys_role_org sro
+                    left join sys_role sr on sr.role_id = sro.role_id
+                    where sro.role_id = %d and sr.status = '0'
                 """.formatted(roleId);
     }
 
@@ -51,7 +53,9 @@ public interface SysOrgMapper extends BaseMapperPlus<SysOrg, SysOrgVo> {
     default String buildParentOrgByRoleSql(Long roleId) {
         return """
                     select parent_id from sys_org where org_id in (
-                        select org_id from sys_role_org where role_id = %d
+                        select sro.org_id from sys_role_org sro
+                            left join sys_role sr on sr.role_id = sro.role_id
+                            where sro.role_id = %d and sr.status = '0'
                     )
                 """.formatted(roleId);
     }