diff --git a/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java index 0c0299e73..043f85175 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.iformall.interceptor.CurrentTenantInterceptor; import com.iformall.interceptor.HttpServletRequestWrapperFilter; import com.iformall.interceptor.RequestInterceptor; import com.iformall.service.MallResourceService; @@ -44,6 +45,9 @@ public class WebConfig implements WebMvcConfigurer { @Autowired private RequestInterceptor requestInterceptor; + + @Autowired + private CurrentTenantInterceptor tenantInterceptor; @Autowired private MallResourceService mallResourceService; @@ -87,6 +91,7 @@ public class WebConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(requestInterceptor).addPathPatterns("/**"); + registry.addInterceptor(tenantInterceptor).addPathPatterns("/**"); } @Override diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index f26d3e90a..6a757c08d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -29,7 +29,7 @@ public class TenantInfoImpl implements TenantInfo { String parentTenantId = null; try { //parentTenantId = (String) SecurityUtils.getSubject().getSession().getAttribute(UserSession.parentTenantId); - parentTenantId = TenantThreadLocal.getTenantId(); + parentTenantId = TenantThreadLocal.getParentTenantId(); } catch (InvalidSessionException e) { logger.error("InvalidSession: " + e.getMessage()); }