diff --git a/pigx-common/pigx-common-test/pom.xml b/pigx-common/pigx-common-test/pom.xml
index 005d07d61..659e9a5bb 100755
--- a/pigx-common/pigx-common-test/pom.xml
+++ b/pigx-common/pigx-common-test/pom.xml
@@ -15,6 +15,10 @@
 	<description>pigx oauth 2.0 单元测试工具类</description>
 
 	<dependencies>
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-data</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-security</artifactId>
diff --git a/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/WithMockSecurityContextFactory.java b/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/WithMockSecurityContextFactory.java
index a882b73ce..77c1e5e22 100644
--- a/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/WithMockSecurityContextFactory.java
+++ b/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/WithMockSecurityContextFactory.java
@@ -5,6 +5,7 @@ import java.nio.charset.StandardCharsets;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
 import com.pig4cloud.pigx.common.core.util.SpringContextHolder;
+import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder;
 import com.pig4cloud.pigx.test.annotation.WithMockOAuth2User;
 
 import org.springframework.http.HttpEntity;
@@ -32,6 +33,9 @@ public class WithMockSecurityContextFactory implements WithSecurityContextFactor
 
 	@Override
 	public SecurityContext createSecurityContext(WithMockOAuth2User oAuth2User) {
+		// 0. 初始化环境
+		TenantContextHolder.setTenantId(oAuth2User.tenant());
+
 		// 1. 请求认证中心获取token
 		String token = getToken(oAuth2User);
 
diff --git a/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/annotation/WithMockOAuth2User.java b/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/annotation/WithMockOAuth2User.java
index 23bc599f8..911c6d1ed 100644
--- a/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/annotation/WithMockOAuth2User.java
+++ b/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/annotation/WithMockOAuth2User.java
@@ -1,11 +1,12 @@
 package com.pig4cloud.pigx.test.annotation;
 
-import com.pig4cloud.pigx.test.WithMockSecurityContextFactory;
-import org.springframework.security.test.context.support.WithSecurityContext;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import com.pig4cloud.pigx.test.WithMockSecurityContextFactory;
+
+import org.springframework.security.test.context.support.WithSecurityContext;
+
 /**
  * @author lengleng
  * @date 2020/9/22
@@ -26,4 +27,9 @@ public @interface WithMockOAuth2User {
 	 */
 	String password() default "123456";
 
+	/**
+	 * 租户编号 默认租户编号1
+	 */
+	int tenant() default 1;
+
 }
\ No newline at end of file