...

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

@@ -205,7 +205,7 @@ public class OrgController extends ControllerSupport {
 	 * @param orgId
 	 * @return
 	 */
-	@ApiOperation(value = "按ID查询顶级机构", notes = "ID查询")
+	@ApiOperation(value = "按ID查询子机构", notes = "ID查询")
 	@GetMapping("subOrg/{orgId}")
 	public OrgEntity getSubOrg(@PathVariable Long orgId) {
 		OrgEntity orgEntity = orgRepo.findOne(orgId);

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/AuthServiceImpl.java

@@ -117,6 +117,8 @@ public class AuthServiceImpl implements AuthService {
 		}
 
 		User user = new User();
+		user.setRootOrgId(rootOrg.getId());
+		user.setRootOrgName(rootOrg.getName());
 		Long orgId = null;
 
 		// 常规账户登录
@@ -135,7 +137,6 @@ public class AuthServiceImpl implements AuthService {
 			user.setUserId(userEntity.getId());
 			user.setUserType(UserType.COMMON);
 			user.setDisplayName(userEntity.getLoginName() + " (" + userEntity.getName() + ")");
-			user.setRootOrgId(userEntity.getRootOrgId());
 			orgId = userEntity.getOrgId();
 
 			List<Role> roleList = getUserRoles(userEntity.getId());
@@ -164,7 +165,6 @@ public class AuthServiceImpl implements AuthService {
 
 			user.setUserId(student.getId());
 			user.setUserType(UserType.STUDENT);
-			user.setRootOrgId(student.getRootOrgId());
 			user.setDisplayName(student.getName());
 			orgId = student.getOrgId();