|
|
@@ -81,6 +81,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
private ISysDictDataService iSysDictDataService;
|
|
|
@Autowired
|
|
|
SysRoleMenuMapper roleMenuMapper;
|
|
|
+
|
|
|
/**
|
|
|
* 根据条件分页查询用户列表
|
|
|
*
|
|
|
@@ -756,13 +757,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
@Override
|
|
|
public List<Long> selectUserRoleMenu(Long userId) {
|
|
|
final List<SysUserRole> roleList = userRoleMapper.selectList(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
|
|
|
final List<Long> collect = roleList.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
|
|
|
return roleMenuMapper.selectList(new LambdaQueryWrapper<SysRoleMenu>()
|
|
|
- .in(SysRoleMenu::getRoleId, collect))
|
|
|
+ .in(ObjectUtil.isNotEmpty(collect), SysRoleMenu::getRoleId, collect))
|
|
|
.stream()
|
|
|
.map(SysRoleMenu::getMenuId)
|
|
|
.distinct()
|