joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

【增加项目信息】

Browse Source
This commit is contained in:
weizhihong 2022-09-29 16:29:23 +08:00
parent a6470891a4
commit e82075281c
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/club/joylink/rtss/vo/AccountVO.java
View File

@ -319,11 +319,4 @@ public class AccountVO implements Serializable {
public boolean isThirdChildAccount() { public boolean isThirdChildAccount() {
return Type_3.equalsIgnoreCase(this.type) && StringUtils.hasText(this.parentAccount); return Type_3.equalsIgnoreCase(this.type) && StringUtils.hasText(this.parentAccount);
} }
/**
* 获取顶级组织Id
*/
public Long getTopOrgId() {
return 1L;
}
} }

11
src/main/java/club/joylink/rtss/vo/LoginUserInfoVO.java
View File

@ -4,6 +4,7 @@ import club.joylink.rtss.constants.Client;
import club.joylink.rtss.entity.SysAccountLogin; import club.joylink.rtss.entity.SysAccountLogin;
import club.joylink.rtss.entity.project.Project; import club.joylink.rtss.entity.project.Project;
import club.joylink.rtss.util.EncryptUtil; import club.joylink.rtss.util.EncryptUtil;
import club.joylink.rtss.vo.client.org.OrgProjectVO;
import club.joylink.rtss.vo.client.project.ProjectDeviceVO; import club.joylink.rtss.vo.client.project.ProjectDeviceVO;
import club.joylink.rtss.vo.project.ProjectVO; import club.joylink.rtss.vo.project.ProjectVO;
import lombok.Getter; import lombok.Getter;
@ -49,6 +50,9 @@ public class LoginUserInfoVO {
private LocalDateTime preLogoutTime; private LocalDateTime preLogoutTime;
private LocalDateTime lastQueryTime; // 最后使用时间 private LocalDateTime lastQueryTime; // 最后使用时间
// 20220929 增加
private OrgProjectVO orgProjectVO;
public LoginUserInfoVO(AccountVO accountVO, Client client, String project, ProjectDeviceVO deviceVO) { public LoginUserInfoVO(AccountVO accountVO, Client client, String project, ProjectDeviceVO deviceVO) {
this.accountVO = accountVO; this.accountVO = accountVO;
this.client = client; this.client = client;
@ -139,4 +143,11 @@ public class LoginUserInfoVO {
public boolean isWechatLogin() { public boolean isWechatLogin() {
return Client.Assistant.equals(this.getClient()); return Client.Assistant.equals(this.getClient());
} }
/**
* 获取顶级组织Id
*/
public Long getTopOrgId() {
return orgProjectVO.getTopOrgId();
}
} }