From c1babcfa8a9cd01dbeb8527a6a95cbcc431957c7 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 22 四月 2026 10:42:35 +0800
Subject: [PATCH] fix:生产模块
---
src/main/java/com/ruoyi/framework/security/LoginUser.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 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..168202f 100644
--- a/src/main/java/com/ruoyi/framework/security/LoginUser.java
+++ b/src/main/java/com/ruoyi/framework/security/LoginUser.java
@@ -74,12 +74,14 @@
/**
* 绉熸埛ID
*/
- private Integer tenantId;
+ private Long tenantId;
/**
* 褰撳墠閮ㄩ棬id
*/
- private Long currentDeptId;
+ private Long currentDeptId;
+
+ private String dataScope;
public LoginUser()
{
@@ -99,7 +101,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 +110,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 +161,11 @@
public String getUsername()
{
return user.getUserName();
+ }
+
+ public String getNickName()
+ {
+ return user.getNickName();
}
/**
@@ -293,11 +300,11 @@
return null;
}
- public Integer getTenantId() {
+ public Long getTenantId() {
return tenantId;
}
- public void setTenantId(Integer tenantId) {
+ public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
@@ -309,7 +316,15 @@
return currentDeptId;
}
- public void setCurrentDeptId(Long currentDeptId) {
- this.currentDeptId = currentDeptId;
- }
-}
+ public void setCurrentDeptId(Long currentDeptId) {
+ this.currentDeptId = currentDeptId;
+ }
+
+ public String getDataScope() {
+ return dataScope;
+ }
+
+ public void setDataScope(String dataScope) {
+ this.dataScope = dataScope;
+ }
+}
--
Gitblit v1.9.3