hsy
5 天以前 cea2f5013782770a2cc99cc89b14cf5c2869bca5
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImpl.java
@@ -57,6 +57,12 @@
    @Resource
    @Lazy // 懒加载,避免循环依赖
    private AdminUserService adminUserService;
    @Resource
    @Lazy
    private cn.iocoder.yudao.module.system.service.permission.PermissionService permissionService;
    @Resource
    @Lazy
    private cn.iocoder.yudao.module.system.service.permission.RoleService roleService;
    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -226,8 +232,18 @@
        }
        if (userType.equals(UserTypeEnum.ADMIN.getValue())) {
            AdminUserDO user = adminUserService.getUser(userId);
            return MapUtil.builder(LoginUser.INFO_KEY_NICKNAME, user.getNickname())
                    .put(LoginUser.INFO_KEY_DEPT_ID, StrUtil.toStringOrNull(user.getDeptId())).build();
            java.util.Map<String, String> info = new java.util.HashMap<>();
            info.put(LoginUser.INFO_KEY_NICKNAME, user.getNickname());
            info.put(LoginUser.INFO_KEY_DEPT_ID, cn.hutool.core.util.StrUtil.toStringOrNull(user.getDeptId()));
            // Fetch roles and put into info
            java.util.Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(userId);
            if (cn.hutool.core.collection.CollUtil.isNotEmpty(roleIds)) {
                java.util.List<cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO> roles = roleService.getRoleList(roleIds);
                if (cn.hutool.core.collection.CollUtil.isNotEmpty(roles)) {
                    info.put(LoginUser.INFO_KEY_ROLE_CODES, cn.hutool.core.collection.CollUtil.join(roles, ",", cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO::getCode));
                }
            }
            return info;
        } else if (userType.equals(UserTypeEnum.MEMBER.getValue())) {
            // 注意:目前 Member 暂时不读取,可以按需实现
            return Collections.emptyMap();