|
|
@@ -2,6 +2,7 @@ package com.jzg.service.impl;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import com.jzg.commons.core.base.BaseController;
|
|
|
import com.jzg.commons.entity.dto.SysCommonFunctionDto;
|
|
|
import com.jzg.commons.entity.po.SysMenu;
|
|
|
import com.jzg.commons.entity.po.SysSystemMenu;
|
|
|
@@ -39,6 +40,8 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu>
|
|
|
|
|
|
private final SysUserRoleMapper sysUserRoleMapper;
|
|
|
|
|
|
+ private final BaseController baseController;
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
public List<SysMenu> findTree(String systemCode, int menuType) {
|
|
|
@@ -82,6 +85,14 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu>
|
|
|
}
|
|
|
sysMenus.sort((o1, o2) -> o1.getOrderNum().compareTo(o2.getOrderNum()));
|
|
|
findChildren(sysMenus, menus, 1);
|
|
|
+
|
|
|
+ List<SysSystemMenu> sysSystemMenus = sysSystemMenuMapper.selectList(new LambdaQueryWrapper<SysSystemMenu>().eq(SysSystemMenu::getSystemCode, baseController.getSystemCode()));
|
|
|
+ List<String> collect = sysSystemMenus.stream().map(x -> x.getMenuId()).collect(Collectors.toList());
|
|
|
+
|
|
|
+ sysMenus = sysMenus.stream()
|
|
|
+ .filter(menu -> collect.contains(menu.getId()))
|
|
|
+ .collect(Collectors.toList());
|
|
|
+
|
|
|
return sysMenus;
|
|
|
}
|
|
|
|