|
@@ -95,10 +95,11 @@ public class SysUserV2ServiceImpl extends ServiceImpl<SysUserDao, SysUser> imple
|
|
BeanUtils.copyProperties(sysUser, sysUserInfo);
|
|
BeanUtils.copyProperties(sysUser, sysUserInfo);
|
|
|
|
|
|
// 获得 用户角色(绑定关系)
|
|
// 获得 用户角色(绑定关系)
|
|
- List<SysUserRole> roles = sysUserRoleDao.selectRoleByUserId(user_id);
|
|
|
|
|
|
+ List<Map<String, Object>> roles = sysUserRoleDao.selectRoleByUserId(user_id);
|
|
sysUserInfo.setRoles(roles);
|
|
sysUserInfo.setRoles(roles);
|
|
|
|
|
|
- List<Long> role_ids = roles.stream().map(SysUserRole::getRole_id).collect(Collectors.toList());
|
|
|
|
|
|
+// List<Long> role_ids = roles.stream().map(SysUserRole::getRole_id).collect(Collectors.toList());
|
|
|
|
+ List<Long> role_ids = roles.stream().map(m -> Convert.toLong(m.get("role_id"))).collect(Collectors.toList());
|
|
sysUserInfo.setRole_id(role_ids);
|
|
sysUserInfo.setRole_id(role_ids);
|
|
|
|
|
|
List<String> modules = sysUserRoleModuleRelationDao.selectUserRoleModuleIdsByRoleIds(role_ids);
|
|
List<String> modules = sysUserRoleModuleRelationDao.selectUserRoleModuleIdsByRoleIds(role_ids);
|