diff --git a/fad-app/src/main/java/com/ruoyi/fadapp/service/impl/FadAppAuthServiceImpl.java b/fad-app/src/main/java/com/ruoyi/fadapp/service/impl/FadAppAuthServiceImpl.java
index 4f572da..8d54233 100644
--- a/fad-app/src/main/java/com/ruoyi/fadapp/service/impl/FadAppAuthServiceImpl.java
+++ b/fad-app/src/main/java/com/ruoyi/fadapp/service/impl/FadAppAuthServiceImpl.java
@@ -1,6 +1,9 @@
 package com.ruoyi.fadapp.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.core.domain.dto.RoleDTO;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.DeviceType;
@@ -16,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.time.Duration;
+import java.util.List;
 
 /**
  * FAD APP认证服务实现类
@@ -152,6 +156,18 @@ public class FadAppAuthServiceImpl implements IFadAppAuthService {
     /**
      * 构建登录用户
      */
+//    private LoginUser buildLoginUser(SysUser user) {
+//        LoginUser loginUser = new LoginUser();
+//        loginUser.setUserId(user.getUserId());
+//        loginUser.setDeptId(user.getDeptId());
+//        loginUser.setUsername(user.getUserName());
+//        loginUser.setNickName(user.getNickName());
+//        loginUser.setUserType(user.getUserType());
+//        loginUser.setMenuPermission(permissionService.getMenuPermission(user));
+//        loginUser.setRolePermission(permissionService.getRolePermission(user));
+//        loginUser.setDeptName(user.getDept() != null ? user.getDept().getDeptName() : "");
+//        return loginUser;
+//    }
     private LoginUser buildLoginUser(SysUser user) {
         LoginUser loginUser = new LoginUser();
         loginUser.setUserId(user.getUserId());
@@ -161,7 +177,9 @@ public class FadAppAuthServiceImpl implements IFadAppAuthService {
         loginUser.setUserType(user.getUserType());
         loginUser.setMenuPermission(permissionService.getMenuPermission(user));
         loginUser.setRolePermission(permissionService.getRolePermission(user));
-        loginUser.setDeptName(user.getDept() != null ? user.getDept().getDeptName() : "");
+        loginUser.setDeptName(ObjectUtil.isNull(user.getDept()) ? "" : user.getDept().getDeptName());
+        List<RoleDTO> roles = BeanUtil.copyToList(user.getRoles(), RoleDTO.class);
+        loginUser.setRoles(roles);
         return loginUser;
     }
 } 
\ No newline at end of file