From af7cd42dcebf799b61de529fb318928c95796d3c Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 22 Dec 2022 23:18:39 +0800 Subject: [PATCH] //undefined --- .../java/com/iformall/interceptor/CurrentTenantInterceptor.java | 2 +- .../java/com/iformall/interceptor/AuthorizationInterceptor.java | 2 +- .../java/com/iformall/interceptor/AuthorizationInterceptor.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java b/mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java index 5bad90e4e..e433667b6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java +++ b/mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java @@ -45,7 +45,7 @@ public class CurrentTenantInterceptor extends HandlerInterceptorAdapter { String tenantId = null; String parenTenantId = null; - if(StringUtils.isNotBlank(mallTenantId)){ + if(StringUtils.isNotBlank(mallTenantId) && !"undefined".equals(mallTenantId)){ tenantId = mallTenantId; WxMall mall = wxMallService.getByTenantId(tenantId); if(StringUtils.isNotBlank(mall.getParentTenantId())){ diff --git a/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index 150f90953..e40c09304 100644 --- a/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -102,7 +102,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " bid失效,请重新登录"); } - if(StringUtils.isNotBlank(mallTenantId)){ + if(StringUtils.isNotBlank(mallTenantId) && !"undefined".equals(mallTenantId)){ tenantId = mallTenantId; WxMall mall = wxMallService.getByTenantId(tenantId); if(StringUtils.isNotBlank(mall.getParentTenantId())){ diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index b24b91487..cf83f66a2 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -87,7 +87,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { String parenTenantId = null; //设置userId到request里,后续根据userId,获取用户信息 request.setAttribute(Constant.LOGIN_USER_KEY, cUser.getId()); - if(StringUtils.isNotBlank(mallTenantId)){ + if(StringUtils.isNotBlank(mallTenantId) && !"undefined".equals(mallTenantId)){ tenantId = mallTenantId; WxMall mall = wxMallService.getByTenantId(tenantId); if(StringUtils.isNotBlank(mall.getParentTenantId())){