From e9f2adb9ddc511c62e1628fbd527ba7cda8294d4 Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期五, 09 五月 2025 14:29:29 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after --- src/main/java/com/ruoyi/common/handler/CustomTenantLineHandler.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ruoyi/common/handler/CustomTenantLineHandler.java b/src/main/java/com/ruoyi/common/handler/CustomTenantLineHandler.java index d8b2b69..031f614 100644 --- a/src/main/java/com/ruoyi/common/handler/CustomTenantLineHandler.java +++ b/src/main/java/com/ruoyi/common/handler/CustomTenantLineHandler.java @@ -9,6 +9,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.util.ObjectUtils; import java.util.Set; @@ -17,8 +18,12 @@ @Override public Expression getTenantId() { - Integer tenantId = SecurityUtils.getLoginUser().getTenantId(); - return new LongValue(tenantId); + try { + Integer tenantId = SecurityUtils.getLoginUser().getTenantId(); + return new LongValue(tenantId); + } catch (Exception e) { + return null; + } } @Override -- Gitblit v1.9.3