|
|
@@ -20,15 +20,9 @@ import com.nb.common.util.SecurityUtil;
|
|
|
import com.nb.system.common.dto.SysMenuAddDTO;
|
|
|
import com.nb.system.common.dto.SysMenuEditDTO;
|
|
|
import com.nb.system.common.dto.SysMenuQueryDTO;
|
|
|
-import com.nb.system.entity.SysMenu;
|
|
|
-import com.nb.system.entity.SysRole;
|
|
|
-import com.nb.system.entity.SysRoleMenu;
|
|
|
-import com.nb.system.entity.SysUserRole;
|
|
|
+import com.nb.system.entity.*;
|
|
|
import com.nb.system.mapper.SysMenuMapper;
|
|
|
-import com.nb.system.service.ISysMenuService;
|
|
|
-import com.nb.system.service.ISysRoleMenuService;
|
|
|
-import com.nb.system.service.ISysRoleService;
|
|
|
-import com.nb.system.service.ISysUserRoleService;
|
|
|
+import com.nb.system.service.*;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.google.common.collect.Maps;
|
|
|
import com.google.common.collect.Sets;
|
|
|
@@ -60,6 +54,10 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
|
|
|
|
|
@Resource
|
|
|
private ISysRoleService sysRoleService;
|
|
|
+
|
|
|
+ @Resource
|
|
|
+ private ISysUserService sysUserService;
|
|
|
+
|
|
|
@Override
|
|
|
public IPage<SysMenu> page(Page reqPage, SysMenuQueryDTO req) {
|
|
|
LambdaQueryWrapper<SysMenu> queryWrapper = Wrappers.lambdaQuery();
|
|
|
@@ -237,6 +235,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
|
|
@Override
|
|
|
public Set<String> getPermissionsByUserId(Long userId) {
|
|
|
// 查询角色列表
|
|
|
+ SysUser user = sysUserService.getById(userId);
|
|
|
List<SysRole> sysRoleList = sysRoleService.listSysRoleByUserId(userId);
|
|
|
boolean admin=sysRoleList.stream().anyMatch(sysRole -> "admin".equalsIgnoreCase(sysRole.getRoleCode()));
|
|
|
if (!admin&&CollectionUtil.isEmpty(sysRoleList)) {
|
|
|
@@ -253,10 +252,10 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
|
|
LambdaQueryWrapper<SysMenu> queryWrapper = Wrappers.lambdaQuery();
|
|
|
queryWrapper.eq(SysMenu::getMenuType, MenuTypeEnum.BUTTON.getCode());
|
|
|
queryWrapper.eq(SysMenu::getStatus, StatusEnum.YES.getCode());
|
|
|
- queryWrapper.eq(!TenantUtil.isTuoRen(),SysMenu::getTenantMenu, true);
|
|
|
+ queryWrapper.eq(!Boolean.TRUE.equals(user.getIsSys()),SysMenu::getTenantMenu, true);
|
|
|
queryWrapper.in(!admin,SysMenu::getId, menuIds);
|
|
|
List<SysMenu> sysMenuList = this.list(queryWrapper);
|
|
|
- return sysMenuList.stream().map(item -> item.getPermission()).collect(Collectors.toSet());
|
|
|
+ return sysMenuList.stream().map(SysMenu::getPermission).collect(Collectors.toSet());
|
|
|
}
|
|
|
|
|
|
@Override
|
