|
@@ -911,10 +911,9 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
|
|
//添加用户会话缓存
|
|
//添加用户会话缓存
|
|
Set<String> roleNames = new HashSet<>(), roleTypes = new HashSet<>();
|
|
Set<String> roleNames = new HashSet<>(), roleTypes = new HashSet<>();
|
|
LinkedMultiValueMap<RoleSourceEnum, String> roleSource = new LinkedMultiValueMap<>();
|
|
LinkedMultiValueMap<RoleSourceEnum, String> roleSource = new LinkedMultiValueMap<>();
|
|
- ;
|
|
|
|
for (SysRole s : authBean.getRoleList()) {
|
|
for (SysRole s : authBean.getRoleList()) {
|
|
roleNames.add(s.getName());
|
|
roleNames.add(s.getName());
|
|
- if (Objects.nonNull(s.getType()) && s.getType() == RoleTypeEnum.ADMIN) {
|
|
|
|
|
|
+ if (Objects.isNull(s.getSource()) && Objects.nonNull(s.getType())) {
|
|
roleTypes.add(s.getType().name());
|
|
roleTypes.add(s.getType().name());
|
|
}
|
|
}
|
|
roleSource.add(Objects.nonNull(s.getSource()) ? s.getSource() : RoleSourceEnum.SYS, Objects.nonNull(s.getType()) ? s.getType().name() : s.getName());
|
|
roleSource.add(Objects.nonNull(s.getSource()) ? s.getSource() : RoleSourceEnum.SYS, Objects.nonNull(s.getType()) ? s.getType().name() : s.getName());
|