suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

菜单权限过滤逻辑调整，取消仅按权限过滤

Browse Source
This commit is contained in:
zhangchenbiao
2023-08-02 10:28:42 +08:00
parent a64fc9cd89
commit b86eaa7c52
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coolstore-partner-service/src/main/java/com/cool/store/service/impl/MenuServiceImpl.java
View File

@@ -37,8 +37,9 @@ public class MenuServiceImpl implements MenuService {
public List<MenuTreeVO> getUserMenus(String userId, String roleId) { public List<MenuTreeVO> getUserMenus(String userId, String roleId) {
List<SysMenuDO> menuList= sysMenuDAO.selectMenuAll(null); List<SysMenuDO> menuList= sysMenuDAO.selectMenuAll(null);
List<SysRoleMenuDO> roleMenuList = sysRoleMenuDAO.getRoleMenuByRoleId(roleId); List<SysRoleMenuDO> roleMenuList = sysRoleMenuDAO.getRoleMenuByRoleId(roleId);
List<Long> anthMenuIdList = menuList.stream().filter(o -> MenuTypeEnum.AUTH.getCode().equals(o.getMenuType())).map(SysMenuDO::getId).collect(Collectors.toList()); /*List<Long> anthMenuIdList = menuList.stream().filter(o -> MenuTypeEnum.AUTH.getCode().equals(o.getMenuType())).map(SysMenuDO::getId).collect(Collectors.toList());
List<Long> roleMenuIdList = roleMenuList.stream().map(SysRoleMenuDO::getMenuId).filter(anthMenuIdList::contains).collect(Collectors.toList()); List<Long> roleMenuIdList = roleMenuList.stream().map(SysRoleMenuDO::getMenuId).filter(anthMenuIdList::contains).collect(Collectors.toList());*/
List<Long> roleMenuIdList = roleMenuList.stream().map(SysRoleMenuDO::getMenuId).collect(Collectors.toList());
Set<Long> authMenuSet = new HashSet<>(); Set<Long> authMenuSet = new HashSet<>();
//1倒推菜单列表 2.转换成树` //1倒推菜单列表 2.转换成树`
if (CollectionUtils.isEmpty(roleMenuIdList)) { if (CollectionUtils.isEmpty(roleMenuIdList)) {