From 7b2233d1dab53574facc66b3bebffcd8ca5919de Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 21 三月 2026 14:27:19 +0800
Subject: [PATCH] yys 1.已退货完毕的出库单号不要展示在关联出库单中 2.退货管理唯一处理 3.生产订单-库存数量回显 4.发货管理回显退货数量 5.发货增加详情接口 6.生产核算清理脏数据 7.生产报工-删除生产报工记录报错 8.筛选客户名称数据展示有误

---
 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