From db78501eff2c72b0f734ab5ff62f7bc121e0a01b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Wed, 27 Mar 2019 22:05:52 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=20mbp=20=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/data/tenant/PigxTenantHandler.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java index 64eaf0dae..af49345f5 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.LongValue; +import net.sf.jsqlparser.expression.NullValue; import org.springframework.beans.factory.annotation.Autowired; /** @@ -43,6 +44,10 @@ public class PigxTenantHandler implements TenantHandler { public Expression getTenantId() { Integer tenantId = TenantContextHolder.getTenantId(); log.debug("当前租户为 >> {}", tenantId); + + if (tenantId == null) { + return new NullValue(); + } return new LongValue(tenantId); } @@ -64,6 +69,12 @@ public class PigxTenantHandler implements TenantHandler { */ @Override public boolean doTableFilter(String tableName) { + Integer tenantId = TenantContextHolder.getTenantId(); + // 租户中ID 为空，查询全部，不进行过滤 + if (tenantId == null) { + return Boolean.TRUE; + } + return !properties.getTables().contains(tableName); } }