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 171cbc3..22c5359 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
@@ -56,7 +56,9 @@ public class SysPermissionService
     {
         Set<SysRole> roles = new HashSet<SysRole>();
         List<SysRole> roleList = roleService.selectRolesByUserId(user.getUserId());
-        roles.addAll(roleList);
+        if (roleList != null && !roleList.isEmpty()) {
+            roles.addAll(roleList);
+        }
         return roles;
     }