|
@@ -222,6 +222,7 @@ public class UserService {
|
|
|
public void createAccessUser(String token,User user,Long studentId)throws Exception{
|
|
|
AccessUser accessUser = new AccessUser();
|
|
|
Set<UserRole> userRoleSet = new HashSet<UserRole>(user.getUserRoles());
|
|
|
+ Org org = orgRepo.findOne(user.getRootOrgId());
|
|
|
Map<String,Set<String>> rolesMap = userRoleSet.stream()
|
|
|
.collect(Collectors.groupingBy(UserRole::getAppCode,
|
|
|
Collectors.mapping(UserRole::getRoleCode,Collectors.toSet())));
|
|
@@ -229,6 +230,7 @@ public class UserService {
|
|
|
accessUser.setName(user.getName());
|
|
|
accessUser.setOrgId(user.getOrgId());
|
|
|
accessUser.setRootOrgId(user.getRootOrgId());
|
|
|
+ accessUser.setRootOrgName(org.getName());
|
|
|
accessUser.setUserId(user.getId());
|
|
|
accessUser.setRoles(rolesMap);
|
|
|
accessUser.setToken(token);
|