From ee5fc9507a3bdc52cbae75f2336dfa19087bc740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 10 Oct 2023 09:48:00 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=A7=9F=E6=88=B7ID=E4=B8=BANull=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/tenant/handle/PlusTenantLineHandler.java       | 3 +++
 .../common/tenant/handle/TenantKeyPrefixHandler.java      | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java
index 70770f271..b510ad23e 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java
@@ -2,6 +2,7 @@ package org.dromara.common.tenant.handle;
 
 import cn.hutool.core.collection.ListUtil;
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
+import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.tenant.helper.TenantHelper;
@@ -18,6 +19,7 @@ import java.util.List;
  *
  * @author Lion Li
  */
+@Slf4j
 @AllArgsConstructor
 public class PlusTenantLineHandler implements TenantLineHandler {
 
@@ -27,6 +29,7 @@ public class PlusTenantLineHandler implements TenantLineHandler {
     public Expression getTenantId() {
         String tenantId = LoginHelper.getTenantId();
         if (StringUtils.isBlank(tenantId)) {
+            log.error("无法获取有效的租户id -> Null");
             return new NullValue();
         }
         String dynamicTenantId = TenantHelper.getDynamic();
diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java
index c9c2f9529..4b3134365 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java
@@ -1,5 +1,6 @@
 package org.dromara.common.tenant.handle;
 
+import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.GlobalConstants;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.redis.handler.KeyPrefixHandler;
@@ -10,6 +11,7 @@ import org.dromara.common.tenant.helper.TenantHelper;
  *
  * @author Lion Li
  */
+@Slf4j
 public class TenantKeyPrefixHandler extends KeyPrefixHandler {
 
     public TenantKeyPrefixHandler(String keyPrefix) {
@@ -28,6 +30,9 @@ public class TenantKeyPrefixHandler extends KeyPrefixHandler {
             return super.map(name);
         }
         String tenantId = TenantHelper.getTenantId();
+        if (StringUtils.isBlank(tenantId)) {
+            log.error("无法获取有效的租户id -> Null");
+        }
         if (StringUtils.startsWith(name, tenantId)) {
             // 如果存在则直接返回
             return super.map(name);
@@ -48,6 +53,9 @@ public class TenantKeyPrefixHandler extends KeyPrefixHandler {
             return super.unmap(name);
         }
         String tenantId = TenantHelper.getTenantId();
+        if (StringUtils.isBlank(tenantId)) {
+            log.error("无法获取有效的租户id -> Null");
+        }
         if (StringUtils.startsWith(unmap, tenantId)) {
             // 如果存在则删除
             return unmap.substring((tenantId + ":").length());