From e568392eeef12d11dc9bc2a49b0f252dbae04c52 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Mon, 24 Jun 2024 11:58:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E8=B6=85=E7=AE=A1=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90=E6=B2=A1=E6=9C=89=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E9=99=90=E5=88=B6=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/auth/AuthController.java   |  3 ---
 .../dal/mysql/permission/RoleMenuMapper.java    | 17 ++++++++++++++---
 .../permission/PermissionServiceImpl.java       |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/AuthController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/AuthController.java
index 84177ba6a..5f443f64f 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/AuthController.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/AuthController.java
@@ -8,7 +8,6 @@ import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
 import com.cf.imes.framework.security.config.SecurityProperties;
 import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
-import com.cf.imes.module.system.controller.admin.auth.vo.*;
 import com.cf.imes.module.system.controller.admin.auth.vo.AuthLoginReqVO;
 import com.cf.imes.module.system.controller.admin.auth.vo.AuthPermissionInfoRespVO;
 import com.cf.imes.module.system.controller.admin.auth.vo.AuthSocialLoginReqVO;
@@ -118,9 +117,7 @@ public class AuthController {
         roles.removeIf(role -> !CommonStatusEnum.ENABLE.getStatus().equals(role.getStatus())); // 移除禁用的角色
 
         // 1.3 获得菜单列表
-        //Set<Long> menuIds = permissionService.getRoleMenuListByRoleId(convertSet(roles, RoleDO::getId));
         Set<Long> menuIds = permissionService.getRoleMenuListByRoleId2(convertSet(roles, RoleDO::getId));
-        //List<MenuDO> menuList = menuService.getMenuList(menuIds);
         List<MenuDO> menuList = menuService.getMenuList1(menuIds);
         menuList.removeIf(menu -> !CommonStatusEnum.ENABLE.getStatus().equals(menu.getStatus())); // 移除禁用的菜单
 
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMenuMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMenuMapper.java
index 169bfccff..f0ea7f69f 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMenuMapper.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMenuMapper.java
@@ -23,6 +23,19 @@ public interface RoleMenuMapper extends BaseMapperX<RoleMenuDO> {
         return selectList(RoleMenuDO::getRoleId, roleIds);
     }
 
+    /**
+     * 基于角色id列表和组织id查询角色菜单列表
+     *
+     * @param roleIds
+     * @param organId
+     * @return
+     */
+    default List<RoleMenuDO> selectListByRoleIdsAndOrganId(Collection<Long> roleIds, Long organId) {
+        return selectList(new LambdaQueryWrapperX<RoleMenuDO>()
+                .eq(RoleMenuDO::getOrganId, organId)
+                .in(RoleMenuDO::getRoleId, roleIds));
+    }
+
     default List<RoleMenuDO> selectListByMenuId(Long menuId) {
         return selectList(RoleMenuDO::getMenuId, menuId);
     }
@@ -43,8 +56,6 @@ public interface RoleMenuMapper extends BaseMapperX<RoleMenuDO> {
 
     @OrganIgnore
     default List<RoleMenuDO> selectListByRoleIdWithOrganAdmin(Collection<Long> roleIds) {
-        return selectList(new LambdaQueryWrapperX<RoleMenuDO>()
-                .eq(RoleMenuDO::getOrganId, InternalRoleConstants.INTERNAL_ROLE_ORGAN_ID)
-                .in(RoleMenuDO::getRoleId, roleIds));
+        return selectListByRoleIdsAndOrganId(roleIds, InternalRoleConstants.INTERNAL_ROLE_ORGAN_ID);
     }
 }
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java
index 3be20159d..0c4b49f9f 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java
@@ -265,7 +265,7 @@ public class PermissionServiceImpl implements PermissionService {
             return convertSet(menuService.getMenuList(), MenuDO::getId);
         }
         // 如果是非管理员的情况下，获得拥有的菜单编号
-        List<RoleMenuDO> from = roleMenuMapper.selectListByRoleId(roleIds);
+        List<RoleMenuDO> from = roleMenuMapper.selectListByRoleIdsAndOrganId(roleIds, OrganContextHolder.getOrganId());
         return convertSet(from, RoleMenuDO::getMenuId);
     }