From ce167d4635756c548b99968871814fe62be3e9fa Mon Sep 17 00:00:00 2001 From: lilong Date: Wed, 13 Nov 2024 16:46:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20(feature/REQ-2595)=20=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0roleType?= =?UTF-8?q?=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/service/impl/SaasFeatureResourceServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java index 498bee46..7331e639 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java @@ -293,7 +293,9 @@ public class SaasFeatureResourceServiceImpl extends ServiceImpl FeatureResourceTreeNode.Role.builder() .roleId(f) .tags(e.getTags()) - .roleType(RoleTypeEnum.getRoleType(roleMap.get(f).getRoleType())) + .roleType(Optional.ofNullable(roleMap.get(f)) + .map(role -> RoleTypeEnum.getRoleType(role.getRoleType())) + .orElse(null)) .build()) .filter(Objects::nonNull) .distinct()