mkm/lihaiMiddleOffice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(admin): 优化管理员权限查询逻辑

Browse Source 
- 修改 AdminLogic 中 getMenuByAdminId 方法的调用，增加 false 参数以获取完整菜单
- 优化 MenuLogic 中的查询条件判断逻辑，提高代码可读性
This commit is contained in:
mkm 2025-03-18 10:29:28 +08:00
parent b05e8f651e
commit f07cbadc05
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/logic/auth/AdminLogic.php
View File

@ -232,7 +232,7 @@ class AdminLogic extends BaseLogic
$result['user'] = $admin; $result['user'] = $admin;
// 当前管理员角色拥有的菜单 // 当前管理员角色拥有的菜单
$result['menu'] = MenuLogic::getMenuByAdminId($params['id']); $result['menu'] = MenuLogic::getMenuByAdminId($params['id'],false);
$result['top_menu'] = MenuLogic::getMenuByAdminId($params['id'],true); $result['top_menu'] = MenuLogic::getMenuByAdminId($params['id'],true);
// 当前管理员橘色拥有的按钮权限 // 当前管理员橘色拥有的按钮权限

4
app/admin/logic/auth/MenuLogic.php
View File

@ -50,11 +50,9 @@ class MenuLogic extends BaseLogic
$where[] = ['type', 'in', ['M', 'C']]; $where[] = ['type', 'in', ['M', 'C']];
$where[] = ['is_disable', '=', 0]; $where[] = ['is_disable', '=', 0];
if($is_top==true){ if ($is_top==true) {
$menu_where[]=['is_top','=',1]; $menu_where[]=['is_top','=',1];
$where[] = ['pid', '=', 0]; $where[] = ['pid', '=', 0];
}
if ($admin['root'] != 1 || $is_top==true) {
if(!empty($admin['role_id'])){ if(!empty($admin['role_id'])){
$menu_where[]=['role_id','in',$admin['role_id']]; $menu_where[]=['role_id','in',$admin['role_id']];
} }