From bc0193e94c96c7ea60be17d250e00408dc787a87 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 18 十一月 2025 17:44:07 +0800
Subject: [PATCH] yys 1.销售、采购关于发票的改成不必填 2.回款类型字典改-下 3.销售台账、采购台账可能不开票直接回款 4.销售台账要直接查产品名字 5.指标维护-内控值为非必填 6.所有税率都自己填,有时候可能不含税

---
 src/main/java/com/ruoyi/framework/security/LoginUser.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/framework/security/LoginUser.java b/src/main/java/com/ruoyi/framework/security/LoginUser.java
index 33f27a2..bb91be1 100644
--- a/src/main/java/com/ruoyi/framework/security/LoginUser.java
+++ b/src/main/java/com/ruoyi/framework/security/LoginUser.java
@@ -74,7 +74,7 @@
     /**
      * 绉熸埛ID
      */
-    private Integer tenantId;
+    private Long tenantId;
 
     /**
      * 褰撳墠閮ㄩ棬id
@@ -99,7 +99,7 @@
         this.permissions = permissions;
     }
 
-    public LoginUser(Long userId, Long [] deptIds, SysUser user,Integer tenantId, Set<String> permissions)
+    public LoginUser(Long userId, Long [] deptIds, SysUser user,Long tenantId, Set<String> permissions)
     {
         this.userId = userId;
         this.deptIds = deptIds;
@@ -108,7 +108,7 @@
         this.tenantId = tenantId;
     }
 
-    public LoginUser(Long userId, Long [] deptIds, SysUser user,Integer tenantId,Long currentDeptId, Set<String> permissions)
+    public LoginUser(Long userId, Long [] deptIds, SysUser user,Long tenantId,Long currentDeptId, Set<String> permissions)
     {
         this.userId = userId;
         this.deptIds = deptIds;
@@ -159,6 +159,11 @@
     public String getUsername()
     {
         return user.getUserName();
+    }
+
+    public String getNickName()
+    {
+        return user.getNickName();
     }
 
     /**
@@ -293,11 +298,11 @@
         return null;
     }
 
-    public Integer getTenantId() {
+    public Long getTenantId() {
         return tenantId;
     }
 
-    public void setTenantId(Integer tenantId) {
+    public void setTenantId(Long tenantId) {
         this.tenantId = tenantId;
     }
 

--
Gitblit v1.9.3