diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java index 2b7515c..26f7883 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java @@ -63,7 +63,6 @@ public class SysUserOnlineController extends BaseController { @Log(title = "在线用户", businessType = BusinessType.FORCE) @DeleteMapping("/{tokenId}") public Result forceLogout (@PathVariable String tokenId) { - System.out.println(tokenId); redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId); return success(); } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java index 8ceaaa0..121e905 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java @@ -2,6 +2,7 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysMenu; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -21,6 +22,8 @@ public interface SysMenuMapper extends BaseMapper { */ public List selectMenuList (SysMenu menu); + public List selectSysMenuList (@Param("longs") List longs); + /** * 根据用户所有权限 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index e4e2ec8..3b11298 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -51,6 +51,23 @@ public class SysMenuServiceImpl extends ServiceImpl impl return selectMenuList(new SysMenu(), userId); } + public List selectSysMenuList(List menuList){ + List longs = menuList.stream() + .map(menu -> menu.getParentId()) + .filter(parentId -> parentId != 0) + .distinct() + .toList(); + if (longs.size()==0){ + return null; + } + List sysMenus = menuMapper.selectSysMenuList(longs); + List sysMenus1 = selectSysMenuList(sysMenus); + if (sysMenus1 != null){ + sysMenus.addAll(sysMenus1); + } + return sysMenus; + } + /** * 查询系统菜单列表 * @@ -64,10 +81,14 @@ public class SysMenuServiceImpl extends ServiceImpl impl // 管理员显示所有菜单信息 if (SysUser.isAdmin(userId)) { menuList = menuMapper.selectMenuList(menu); + menuList.addAll(selectSysMenuList(menuList)); } else { menu.getParams().put("userId", userId); menuList = menuMapper.selectMenuListByUserId(menu); } + menuList = menuList.stream() + .distinct() + .toList(); return menuList; } diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml index 1dac5c4..bcd87d8 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -185,6 +185,17 @@ where menu_name=#{menuName} and parent_id = #{parentId} limit 1 + update sys_menu