From 1b912a25864dfbe6968740738afe7c042919724a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 02 二月 2026 15:53:21 +0800
Subject: [PATCH] 生产报工的报废未进入库存记录页面中+不合格处理后不能删除

---
 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..d1b6d54 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 {
+            Long tenantId = SecurityUtils.getLoginUser().getTenantId();
+            return new LongValue(tenantId);
+        } catch (Exception e) {
+            return null;
+        }
     }
 
     @Override

--
Gitblit v1.9.3