|
@@ -230,7 +230,9 @@ public class UserService {
|
|
accessUser.setName(user.getName());
|
|
accessUser.setName(user.getName());
|
|
accessUser.setOrgId(user.getOrgId());
|
|
accessUser.setOrgId(user.getOrgId());
|
|
accessUser.setRootOrgId(user.getRootOrgId());
|
|
accessUser.setRootOrgId(user.getRootOrgId());
|
|
- accessUser.setRootOrgName(org.getName());
|
|
|
|
|
|
+ if(org != null){
|
|
|
|
+ accessUser.setRootOrgName(org.getName());
|
|
|
|
+ }
|
|
accessUser.setUserId(user.getId());
|
|
accessUser.setUserId(user.getId());
|
|
accessUser.setRoles(rolesMap);
|
|
accessUser.setRoles(rolesMap);
|
|
accessUser.setToken(token);
|
|
accessUser.setToken(token);
|