From 2980c6e3eb503b4489870d9e12e73e3fc256e401 Mon Sep 17 00:00:00 2001
From: Awen <39176130+yu1183688986@users.noreply.github.com>
Date: Wed, 9 Mar 2022 14:55:54 +0800
Subject: [PATCH] 修复正常租户登陆后退出切换到过期租户时造成的tenant.ignore-urls配置失效的问题，比如无法获取验证码图片等造成无法登录。

---
 yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java
index 0e1f634..31cab14 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java
@@ -75,16 +75,16 @@ public class TenantSecurityWebFilter extends ApiRequestFilter {
             }
         }
 
-        // 2. 如果请求未带租户的编号，检查是否是忽略的 URL，否则也不允许访问。
-        if (tenantId == null && !isIgnoreUrl(request)) {
-            log.error("[doFilterInternal][URL({}/{}) 未传递租户编号]", request.getRequestURI(), request.getMethod());
-            ServletUtils.writeJSON(response, CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST.getCode(),
-                    "租户的请求未传递，请进行排查"));
-            return;
-        }
-
-        // 3. 校验租户是合法，例如说被禁用、到期
-        if (tenantId != null) {
+        //检查是否是忽略的 URL, 如果是则允许访问
+        if (!isIgnoreUrl(request)) {
+            // 2. 如果请求未带租户的编号，不允许访问。
+            if (tenantId == null) {
+                log.error("[doFilterInternal][URL({}/{}) 未传递租户编号]", request.getRequestURI(), request.getMethod());
+                ServletUtils.writeJSON(response, CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST.getCode(),
+                        "租户的请求未传递，请进行排查"));
+                return;
+            }
+            // 3. 校验租户是合法，例如说被禁用、到期
             try {
                 tenantFrameworkService.validTenant(tenantId);
             } catch (Throwable ex) {
--
libgit2 0.21.4