|
@@ -61,12 +61,18 @@ public class SysUserV2ServiceImpl extends ServiceImpl<SysUserDao, SysUser> imple
|
|
|
SysUserInfo sysUserInfo = sysUserInfoDao.selectOne(new QueryWrapper<SysUserInfo>().eq("user_id", user_id));
|
|
|
Objects.requireNonNull(sysUserInfo, "用户不存在");
|
|
|
|
|
|
- // 账号信息 赋值到 基本信息
|
|
|
+ // 用户账号信息 赋值到 用户基本信息
|
|
|
BeanUtils.copyProperties(sysUser, sysUserInfo);
|
|
|
|
|
|
// 获得 用户角色(绑定关系)
|
|
|
- List<SysUserRole> sysUserRoleList = sysUserRoleDao.selectRoleByUserId(user_id);
|
|
|
- sysUserInfo.setRoles(sysUserRoleList);
|
|
|
+ List<SysUserRole> roles = sysUserRoleDao.selectRoleByUserId(user_id);
|
|
|
+ sysUserInfo.setRoles(roles);
|
|
|
+
|
|
|
+ List<Long> role_ids = roles.stream().map(SysUserRole::getRole_id).collect(Collectors.toList());
|
|
|
+ sysUserInfo.setRole_id(role_ids);
|
|
|
+
|
|
|
+ List<String> modules = sysUserRoleModuleRelationDao.selectUserRoleModuleIdsByRoleIds(role_ids);
|
|
|
+ sysUserInfo.setModules(modules);
|
|
|
|
|
|
return sysUserInfo;
|
|
|
}
|