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

Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin

Browse Source
This commit is contained in:
tiger_zhou 2022-10-24 16:45:02 +08:00
commit 6fcbf24d13
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/club/joylink/rtss/simulation/cbtc/GroupSimulationServiceImpl.java
View File

@ -4,6 +4,7 @@ import club.joylink.rtss.configuration.configProp.OtherConfig;
import club.joylink.rtss.configuration.configProp.WeChatConfig; import club.joylink.rtss.configuration.configProp.WeChatConfig;
import club.joylink.rtss.constants.MapPrdTypeEnum; import club.joylink.rtss.constants.MapPrdTypeEnum;
import club.joylink.rtss.constants.ProjectDeviceType; import club.joylink.rtss.constants.ProjectDeviceType;
import club.joylink.rtss.entity.project.Project;
import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.services.*; import club.joylink.rtss.services.*;
import club.joylink.rtss.services.org.IOrgService; import club.joylink.rtss.services.org.IOrgService;
@ -1086,7 +1087,7 @@ public class GroupSimulationServiceImpl implements GroupSimulationService {
} }
} }
if (accountVO.getCompanyId() != null) { if (accountVO.getCompanyId() != null) {
String mapProject = mapDetail.getProjectCode(); String mapProject = Project.isDefault(mapDetail.getProjectCode()) ? Project.DEFAULT_PROJECT_CODE : mapDetail.getProjectCode();
return accountVO.getProjectCodes().stream().anyMatch(orgProject -> Objects.equals(mapProject, orgProject)); return accountVO.getProjectCodes().stream().anyMatch(orgProject -> Objects.equals(mapProject, orgProject));
} }
return false; return false;

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

@ -327,10 +327,12 @@ public class AccountVO implements Serializable {
this.companyName = orgProjectVO.getName(); this.companyName = orgProjectVO.getName();
this.companyAdmin = !CollectionUtils.isEmpty(orgProjectVO.getRole()) this.companyAdmin = !CollectionUtils.isEmpty(orgProjectVO.getRole())
&& orgProjectVO.getRole().contains(BusinessConsts.OrgRole.Admin.name()); && orgProjectVO.getRole().contains(BusinessConsts.OrgRole.Admin.name());
this.projectCodes = Arrays.asList(orgProjectVO.getProjectCode().split(","));
} else { } else {
this.companyId = 0L; this.companyId = 0L;
this.companyName = null; this.companyName = null;
this.companyAdmin = false; this.companyAdmin = false;
this.projectCodes = List.of();
} }
} }
} }

3
src/main/java/club/joylink/rtss/vo/client/org/OrgProjectVO.java
View File

@ -17,9 +17,12 @@ public class OrgProjectVO {
private List<String> role; private List<String> role;
private String projectCode;
public OrgProjectVO(Org org) { public OrgProjectVO(Org org) {
this.orgId = org.getId(); this.orgId = org.getId();
this.name = org.getName(); this.name = org.getName();
this.topOrgId = org.getRootId(); this.topOrgId = org.getRootId();
this.projectCode = org.getProjectCode();
} }
} }