diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index ceca116..c3a8604 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -163,13 +163,14 @@ public class SysLoginController
         SysUser user = SecurityUtils.getLoginUser().getUser();
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);
-//        Set<SysRole> sysRole = permissionService.getSysRolePermission(user);
+        List<SysRole> sysRole = permissionService.getSysRolePermission(user);
+        user.setRoles(sysRole);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);
         ajax.put("roles", roles);
-//        ajax.put("sysRole", sysRole);
+        ajax.put("sysRole", sysRole);
         ajax.put("permissions", permissions);
         return ajax;
     }
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
index 22c5359..cbd9746 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
@@ -1,15 +1,17 @@
 package com.ruoyi.framework.web.service;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.system.service.ISysMenuService;
 import com.ruoyi.system.service.ISysRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 用户权限处理
@@ -52,14 +54,15 @@ public class SysPermissionService
      * @param user 用户信息
      * @return 角色权限信息
      */
-    public Set<SysRole> getSysRolePermission(SysUser user)
+    public List<SysRole> getSysRolePermission(SysUser user)
     {
         Set<SysRole> roles = new HashSet<SysRole>();
         List<SysRole> roleList = roleService.selectRolesByUserId(user.getUserId());
         if (roleList != null && !roleList.isEmpty()) {
             roles.addAll(roleList);
+            roleList = roles.stream().collect(Collectors.toList());;
         }
-        return roles;
+        return roleList;
     }
 
     /**