fix 无角色登录

9acb7e38 · shiziyuan9527 · 511cd64a · 9acb7e38
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

backend/src/main/java/io/metersphere/service/UserService.java ...end/src/main/java/io/metersphere/service/UserService.java +2 -2

未找到文件。
--- a/backend/src/main/java/io/metersphere/service/UserService.java
+++ b/backend/src/main/java/io/metersphere/service/UserService.java
@@ -141,8 +141,8 @@ public class UserService {
        UserDTO userDTO = new UserDTO();
        BeanUtils.copyProperties(user, userDTO);
        UserRoleDTO userRole = getUserRole(userId);
-        userDTO.setUserRoles(userRole.getUserRoles());
-        userDTO.setRoles(userRole.getRoles());
+        userDTO.setUserRoles(Optional.ofNullable(userRole.getUserRoles()).orElse(new ArrayList<>()));
+        userDTO.setRoles(Optional.ofNullable(userRole.getRoles()).orElse(new ArrayList<>()));
        return userDTO;
    }