From feb64386892e39792ae7b41dfc899822b2e8d9f0 Mon Sep 17 00:00:00 2001 From: zhansihu Date: Thu, 11 Jan 2024 17:09:00 +0800 Subject: [PATCH] =?UTF-8?q?fix(context):=20=E5=85=BC=E5=AE=B9NPE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/auth/service/ContextInfoBuilderAspect.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java index ffee172..9d6e377 100644 --- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java +++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java @@ -326,6 +326,7 @@ public class ContextInfoBuilderAspect { private void fillOUWorkspaceType(ContextInfo contextInfo, Map userinfoMap) { try { + contextInfo.setWorkspaceType(Integer.parseInt(userinfoMap.getOrDefault("workspaceType", "0").toString())); //ouType和ouTypes contextInfo.setOuType(Integer.parseInt(userinfoMap.getOrDefault("ouType", "0").toString())); Object ouTypes = userinfoMap.get("ouTypes"); @@ -333,12 +334,11 @@ public class ContextInfoBuilderAspect { contextInfo.setOuTypes(((JSONArray) ouTypes).toList(Integer.class)); } //workspaceJoinType和 workspaceJoinTypes; - contextInfo.setWorkspaceType(Integer.parseInt(userinfoMap.getOrDefault("workspaceType", "0").toString())); - Object workspaceTypes = userinfoMap.get("workspaceTypes"); + contextInfo.setWorkspaceJoinType(Integer.parseInt(userinfoMap.getOrDefault("workspaceJoinType", "0").toString())); + Object workspaceTypes = userinfoMap.get("workspaceJoinTypes"); if (workspaceTypes instanceof JSONArray) { contextInfo.setWorkspaceJoinTypes(((JSONArray) workspaceTypes).toList(Integer.class)); } - contextInfo.setWorkspaceJoinType(Integer.parseInt(userinfoMap.get("workspaceJoinType").toString())); } catch (Throwable t) { log.warn("fill ouType/workspace join type error", t);