diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/UserManageServiceImpl.java b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/UserManageServiceImpl.java index ec350b1..68b595b 100644 --- a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/UserManageServiceImpl.java +++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/UserManageServiceImpl.java @@ -67,7 +67,8 @@ public class UserManageServiceImpl implements UserManageService { Optional optById = systemDeptService.getOptById(user.get().getDeptId()); loginResVO.setDeptName(optById.isPresent() ? optById.get().getDeptName() : "未知部门"); UserInfo userInfoToken = BeanUtil.copyProperties(user.get(), UserInfo.class); - userInfoToken.setRoleTypeList(); + + userInfoToken.setRoleTypeList(userRoleDTOS.stream().map(UserRoleDTO::getRoleType).toList()); // 更新用户最近的登录时间 systemUserService.lambdaUpdate().set(SystemUser::getRecentLoginTime, LocalDateTime.now()).eq(SystemUser::getId, user.get().getId()).update(); String token = TokenUtil.creatToken(JSONUtil.toJsonStr(userInfoToken)); diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/dto/role/UserRoleDTO.java b/know_sub_model/src/main/java/com/supervision/knowsub/dto/role/UserRoleDTO.java index 8b96951..62c0b83 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/dto/role/UserRoleDTO.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/dto/role/UserRoleDTO.java @@ -11,5 +11,5 @@ public class UserRoleDTO { private String roleName; - private String roleType; + private Integer roleType; }