role info add roletype

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;
     }