wangli/axzo-framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(context): 兼容NPE

Browse Source
This commit is contained in:
zhansihu 2024-01-11 17:09:00 +08:00
parent 7de71dabf0
commit feb6438689
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java
View File

@ -326,6 +326,7 @@ public class ContextInfoBuilderAspect {
private void fillOUWorkspaceType(ContextInfo contextInfo, Map<String, Object> 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);