21

src/main/java/com/fdkankan/manage/service/impl/SysMenuServiceImpl.java

@@ -69,6 +69,10 @@ public class SysMenuServiceImpl extends ServiceImpl<ISysMenuMapper, SysMenu> imp
     @Override
     public List<SysMenuVo> getByUserId(Long userId) {
         SysUser user = userService.getById(userId);
+        List<SysRoleMenu> roleMenus  = roleMenuService.getByRoleId(user.getRoleId());
+        if(roleMenus == null || roleMenus.size() <=0){
+            return new ArrayList<>();
+        }
         List<SysMenu> menuList  = this.getListByUserId(userId);
         List<Long> menuIds = menuList.parallelStream().map(SysMenu::getId).collect(Collectors.toList());
         //menuList.forEach(sysMenu -> setMenuIds(menuIds,sysMenu));
@@ -142,6 +146,9 @@ public class SysMenuServiceImpl extends ServiceImpl<ISysMenuMapper, SysMenu> imp
     public List<SysMenu> getButtonByUserId(Long userId) {
         SysUser user = userService.getById(userId);
         List<SysRoleMenu> roleMenus  = roleMenuService.getByRoleId(user.getRoleId());
+        if(roleMenus == null || roleMenus.size() <=0){
+            return new ArrayList<>();
+        }
         List<Long> menuId = roleMenus.parallelStream().map(SysRoleMenu::getMenuId).collect(Collectors.toList());
         LambdaQueryWrapper<SysMenu> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(SysMenu::getId,menuId);