From 8e39f175ef26827d08904a65b10748e736eeca21 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 23 六月 2025 10:20:08 +0800
Subject: [PATCH] 2025-06-23 【销售台账】 增加客户合同号、销售合同号、项目名称模糊查询 增加客户名称、客户合同号、项目名称查询，不显示待回款为0，默认为打钩。 销售管理】-【回款流水】，增加合同号、项目名称列查询，增加客户名称、项目名称、合同号查询条件。 【销售管理】-【回款登记】，增加导出功能
---
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