Skip to content

Commit 2ef3a26

Browse files
committed
fix bug
1 parent aa9e565 commit 2ef3a26

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

app/Service/SysUserService.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ public function getNemuNav(int $user_id): array
9292
$datas = Db::select('SELECT * FROM sys_menu;');
9393
}
9494
$menu_ids = array_column($datas, 'menu_id');
95+
9596
$result = $this->getUserMenusPermissions($menu_ids);
9697

9798
$redis->set($app_name . "_menu_nav:" . $user_id, json_encode($result), 60); //暂时设置60秒
@@ -111,9 +112,10 @@ private function getUserMenusPermissions($menu_ids)
111112
$menuList = [];
112113
foreach ($menu_category as $key => $value) {
113114
$model = SysMenu::query()->where("menu_id", $value['menu_id'])->first();
115+
114116
$format = SysMenuFormatter::instance()->base($model);
115117

116-
$menus = Db::select('SELECT * FROM sys_menu where parent_id = ' . $format['menuId'] . ' and type = 1 order by order_num asc;');
118+
$menus = Db::select('SELECT * FROM sys_menu where parent_id = ' . $format['menuId'] . ' and menu_id in (' . implode(',', $menu_ids) . ') and type = 1 order by order_num asc;');
117119

118120
$arr = [];
119121
foreach ($menus as $v) {
@@ -484,7 +486,7 @@ public function sysRoleSave(int $userId, string $roleName, $remark, array $menuI
484486
$currentMenuIds = $currentMenuIds->toArray();
485487

486488
// 对比当前和提交的菜单的差集
487-
if (json_encode($currentMenuIds,true) == json_encode($menuIdList,true)) {
489+
if (json_encode($currentMenuIds, true) == json_encode($menuIdList, true)) {
488490
Db::commit();
489491
return true;
490492
}

0 commit comments

Comments
 (0)