From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
index 963aa01..186be08 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
@@ -2,6 +2,8 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.TTenantResp;
+import lombok.Data;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
@@ -13,6 +15,7 @@
*
* @author ruoyi
*/
+@Data
public class LoginUserApplet implements UserDetails
{
private static final long serialVersionUID = 1L;
@@ -20,7 +23,7 @@
/**
* 用户ID
*/
- private Long userId;
+ private String userId;
/**
* 部门ID
@@ -70,19 +73,20 @@
/**
* 用户信息
*/
- private SysUser user;
+ private TTenantResp user;
+
public LoginUserApplet()
{
}
- public LoginUserApplet(SysUser user, Set<String> permissions)
+ public LoginUserApplet(TTenantResp user, Set<String> permissions)
{
this.user = user;
this.permissions = permissions;
}
- public LoginUserApplet(Long userId, Long deptId, SysUser user, Set<String> permissions)
+ public LoginUserApplet(String userId, Long deptId, TTenantResp user, Set<String> permissions)
{
this.userId = userId;
this.deptId = deptId;
@@ -90,12 +94,12 @@
this.permissions = permissions;
}
- public Long getUserId()
+ public String getUserId()
{
return userId;
}
- public void setUserId(Long userId)
+ public void setUserId(String userId)
{
this.userId = userId;
}
@@ -130,7 +134,7 @@
@Override
public String getUsername()
{
- return user.getUserName();
+ return user.getResidentName();
}
/**
@@ -249,15 +253,7 @@
this.permissions = permissions;
}
- public SysUser getUser()
- {
- return user;
- }
- public void setUser(SysUser user)
- {
- this.user = user;
- }
@Override
public Collection<? extends GrantedAuthority> getAuthorities()
--
Gitblit v1.7.1