From b13559fc8950a6cbd58099e21e05b57c4a7c8c22 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Thu, 4 Jul 2024 17:44:11 +0800
Subject: [PATCH] role info add roletype
---
.../knowsub/service/impl/UserManageServiceImpl.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
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 c2db109..a5000b5 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
@@ -58,19 +58,19 @@ public class UserManageServiceImpl implements UserManageService {
if (user.get().getStatus() == 1){
throw new BusinessException("该用户已被停用，请联系管理员！");
}
- UserInfo userInfoToken = BeanUtil.copyProperties(user.get(), UserInfo.class);
- // 更新用户最近的登录时间
- systemUserService.lambdaUpdate().set(SystemUser::getRecentLoginTime, LocalDateTime.now()).eq(SystemUser::getId, user.get().getId()).update();
- String token = TokenUtil.creatToken(JSONUtil.toJsonStr(userInfoToken));
-
LoginResVO loginResVO = BeanUtil.toBean(user.get(), LoginResVO.class);
- loginResVO.setToken(token);
+
loginResVO.setUsername(user.get().getUsername());
List<UserRoleDTO> userRoleDTOS = userRoleRelationManageService.listUserRole(user.get().getId(),null,null);
loginResVO.setUserRoleDTOList(userRoleDTOS);
// 获取用户的部门
Optional<SystemDept> optById = systemDeptService.getOptById(user.get().getDeptId());
loginResVO.setDeptName(optById.isPresent() ? optById.get().getDeptName() : "未知部门");
+ UserInfo userInfoToken = BeanUtil.copyProperties(user.get(), UserInfo.class);
+ // 更新用户最近的登录时间
+ systemUserService.lambdaUpdate().set(SystemUser::getRecentLoginTime, LocalDateTime.now()).eq(SystemUser::getId, user.get().getId()).update();
+ String token = TokenUtil.creatToken(JSONUtil.toJsonStr(userInfoToken));
+ loginResVO.setToken(token);
return loginResVO;
}