From 9bfa420a764f19750cbd91df897fc6ae6fd0f1cc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 09 八月 2021 09:55:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
index e13ec1e..7bc072a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
@@ -24,6 +24,16 @@
private static final long serialVersionUID = 1L;
/**
+ * 鐢ㄦ埛ID
+ */
+ private Long userId;
+
+ /**
+ * 閮ㄩ棬ID
+ */
+ private Long deptId;
+
+ /**
* 鐢ㄦ埛鍞竴鏍囪瘑
*/
private String token;
@@ -74,6 +84,14 @@
this.permissions = permissions;
}
+ public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
+ {
+ this.userId = userId;
+ this.deptId = deptId;
+ this.user = user;
+ this.permissions = permissions;
+ }
+
@JsonIgnore
@Override
public String getPassword()
@@ -81,7 +99,6 @@
return user.getPassword();
}
- @JsonIgnore
@Override
public String getUsername()
{
@@ -134,7 +151,6 @@
return true;
}
- @JsonIgnore
@Override
public Collection<? extends GrantedAuthority> getAuthorities()
{
--
Gitblit v1.9.3