diff --git a/ebike-user/src/main/java/com/cdzy/user/component/MyTenantFactory.java b/ebike-user/src/main/java/com/cdzy/user/component/MyTenantFactory.java
index b227eb21..03ae0f42 100644
--- a/ebike-user/src/main/java/com/cdzy/user/component/MyTenantFactory.java
+++ b/ebike-user/src/main/java/com/cdzy/user/component/MyTenantFactory.java
@@ -6,10 +6,13 @@ import org.springframework.web.context.request.RequestContextHolder;
 
 public class MyTenantFactory implements TenantFactory {
 
-    public Object[] getTenantIds(){
+    public Object[] getTenantIds() {
         RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
         Long tenantId = (Long) attributes.getAttribute("tenantId", RequestAttributes.SCOPE_REQUEST);
-
-        return new Object[]{tenantId};
+        if (tenantId != null) {
+            return new Object[]{tenantId};
+        } else {
+            return new Object[]{};
+        }
     }
 }
\ No newline at end of file
diff --git a/ebike-user/src/main/java/com/cdzy/user/component/TenantInterceptor.java b/ebike-user/src/main/java/com/cdzy/user/component/TenantInterceptor.java
index 1c122ef0..b0e9837f 100644
--- a/ebike-user/src/main/java/com/cdzy/user/component/TenantInterceptor.java
+++ b/ebike-user/src/main/java/com/cdzy/user/component/TenantInterceptor.java
@@ -6,7 +6,6 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.servlet.HandlerInterceptor;
 
-import java.util.List;
 
 public class TenantInterceptor implements HandlerInterceptor {
 
@@ -15,11 +14,12 @@ public class TenantInterceptor implements HandlerInterceptor {
             , HttpServletResponse response, Object handler) throws Exception {
 
         //通过 request 去获取租户 ID
-        Long tenantId = getTenantIdByReuqest(request);
-
-        //设置租户ID到 request 的 attribute
-        request.setAttribute("tenantId", tenantId);
-
+        if (StpUtil.isLogin()) {
+            Long tenantId = getTenantIdByReuqest(request);
+            //设置租户ID到 request 的 attribute
+            request.setAttribute("tenantId", tenantId);
+            return true;
+        }
         return true;
     }