Merge remote-tracking branch 'origin/master'

liding

2025-05-07 0ddea65ff88b3b750ff14d9deb51fa0cda8e52a1

 src/main/java/com/ruoyi/framework/security/LoginUser.java

@@ -4,7 +4,7 @@
import java.util.Set;

import org.springframework.security.core.GrantedAuthority;

import org.springframework.security.core.userdetails.UserDetails;

import com.alibaba.fastjson.annotation.JSONField;

import com.alibaba.fastjson2.annotation.JSONField;

import com.ruoyi.project.system.domain.SysUser;



/**

@@ -71,6 +71,38 @@
     */

    private SysUser user;



    /**

     * 租户ID

     */

    private Integer tenantId;



    public LoginUser()

    {

    }



    public LoginUser(SysUser user, Set<String> permissions)

    {

        this.user = user;

        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;

    }



    public LoginUser(Long userId, Long deptId, SysUser user,Integer tenantId, Set<String> permissions)

    {

        this.userId = userId;

        this.deptId = deptId;

        this.user = user;

        this.permissions = permissions;

        this.tenantId = tenantId;

    }



    public Long getUserId()

    {

        return userId;

@@ -99,24 +131,6 @@
    public void setToken(String token)

    {

        this.token = token;

    }



    public LoginUser()

    {

    }



    public LoginUser(SysUser user, Set<String> permissions)

    {

        this.user = user;

        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;

    }



    @JSONField(serialize = false)

@@ -263,4 +277,12 @@
    {

        return null;

    }



    public Integer getTenantId() {

        return tenantId;

    }



    public void setTenantId(Integer tenantId) {

        this.tenantId = tenantId;

    }

}