1. 修复回滚父子角色功能时错误的代码逻辑,补全单元测试用例
2. 新增支持切换后业务菜单查询需限定只查询该公司业务数据能力
This commit is contained in:
@@ -20,6 +20,14 @@ public class LoginUser {
|
||||
|
||||
public static final String INFO_KEY_NICKNAME = "nickname";
|
||||
public static final String INFO_KEY_TENANT_ID = "tenantId";
|
||||
// 用户关联的公司 Id
|
||||
public static final String INFO_KEY_COMPANY_IDS = "companyIds";
|
||||
// 用户关联的部门 Id
|
||||
public static final String INFO_KEY_DEPT_IDS = "deptIds";
|
||||
// 用户关联的公司与部门关联关系
|
||||
public static final String INFO_KEY_COMPANY_DEPT_SET = "companyDeptSet";
|
||||
// 用户关联的岗位信息
|
||||
public static final String INFO_KEY_POST_IDS = "postIds";
|
||||
|
||||
/**
|
||||
* 用户编号
|
||||
|
||||
@@ -82,6 +82,17 @@ public class SecurityFrameworkUtils {
|
||||
return authentication.getPrincipal() instanceof LoginUser ? (LoginUser) authentication.getPrincipal() : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获得当前用户访问的公司 Id,从上下文中
|
||||
*
|
||||
* @return 用户编号
|
||||
*/
|
||||
@Nullable
|
||||
public static Long getLoginUserCompanyId() {
|
||||
LoginUser loginUser = getLoginUser();
|
||||
return loginUser != null ? loginUser.getVisitCompanyId() : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获得当前用户的编号,从上下文中
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user