|
|
@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; |
|
|
import cn.hutool.core.util.StrUtil; |
|
|
import cn.hutool.core.util.StrUtil; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
import com.crm.auth.domain.entity.*; |
|
|
import com.crm.auth.domain.entity.*; |
|
|
|
|
|
import com.crm.auth.domain.enums.MenuType; |
|
|
import com.crm.auth.mapper.*; |
|
|
import com.crm.auth.mapper.*; |
|
|
import com.crm.auth.service.DeptTreeCache; |
|
|
import com.crm.auth.service.DeptTreeCache; |
|
|
import com.crm.base.security.DataScopeLevel; |
|
|
import com.crm.base.security.DataScopeLevel; |
|
|
@ -83,7 +84,7 @@ public class PermissionServiceImpl { |
|
|
.map(SysRoleMenu::getMenuId).collect(Collectors.toSet()); |
|
|
.map(SysRoleMenu::getMenuId).collect(Collectors.toSet()); |
|
|
List<SysMenu> menus = sysMenuMapper.selectBatchIds(menuIds); |
|
|
List<SysMenu> menus = sysMenuMapper.selectBatchIds(menuIds); |
|
|
menus.stream() |
|
|
menus.stream() |
|
|
.filter(m -> m.getMenuType() != null && m.getMenuType() == 3) |
|
|
.filter(m -> m.getMenuType() != null && m.getMenuType() == MenuType.BUTTON.getCode()) |
|
|
.filter(m -> "enabled".equals(m.getStatus())) |
|
|
.filter(m -> "enabled".equals(m.getStatus())) |
|
|
.map(SysMenu::getPerms) |
|
|
.map(SysMenu::getPerms) |
|
|
.filter(StrUtil::isNotBlank) |
|
|
.filter(StrUtil::isNotBlank) |
|
|
@ -114,7 +115,7 @@ public class PermissionServiceImpl { |
|
|
List<SysMenu> allMenus = sysMenuMapper.selectBatchIds(menuIds); |
|
|
List<SysMenu> allMenus = sysMenuMapper.selectBatchIds(menuIds); |
|
|
List<SysMenu> visibleMenus = allMenus.stream() |
|
|
List<SysMenu> visibleMenus = allMenus.stream() |
|
|
.filter(m -> Boolean.TRUE.equals(m.getVisible())) |
|
|
.filter(m -> Boolean.TRUE.equals(m.getVisible())) |
|
|
.filter(m -> m.getMenuType() != 3) |
|
|
.filter(m -> m.getMenuType() != MenuType.BUTTON.getCode()) |
|
|
.sorted(Comparator.comparingInt(m -> m.getSort() != null ? m.getSort() : 0)) |
|
|
.sorted(Comparator.comparingInt(m -> m.getSort() != null ? m.getSort() : 0)) |
|
|
.collect(Collectors.toList()); |
|
|
.collect(Collectors.toList()); |
|
|
return TreeUtils.buildTree(visibleMenus, SysMenu::getId, SysMenu::getParentId, SysMenu::setChildren); |
|
|
return TreeUtils.buildTree(visibleMenus, SysMenu::getId, SysMenu::getParentId, SysMenu::setChildren); |
|
|
|