提交代码

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/UserCloudServiceProvider.java

@@ -76,6 +76,8 @@ public class UserCloudServiceProvider extends ControllerSupport implements UserC
 			if (StringUtils.isBlank(rootOrgId)) {
 				throw new StatusException("B-001002", "domain错误");
 			}
+		}else{
+			org = orgRepo.findOne(Long.valueOf(rootOrgId));
 		}
 
 		String accountType = req.getAccountType();
@@ -98,7 +100,7 @@ public class UserCloudServiceProvider extends ControllerSupport implements UserC
 			userBean.setUserId(user.getId());
 			userBean.setDisplayName(user.getLoginName());
 			userBean.setRootOrgId(user.getRootOrgId());
-			userBean.setRootOrgName(org.getName());
+			userBean.setRootOrgName(org!=null?org.getName():null);
 			userBean.setOrgId(user.getOrgId());
 			List<UserRole> userRoles = user.getUserRoles();
 			ArrayList<RoleBean> roleList = Lists.newArrayList();