Merge remote-tracking branch 'origin/master'

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -58,6 +58,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		organ.setTenantId(tenantId);
 		sysUser.setTenantId(tenantId);
 		SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
+		organ.setParentOrganId(queryUserInfo.getId());
 		if(user != null && user.getId() != null){
 			Organization organization = organDao.get(user.getId());
 			if(organization == null){
@@ -87,9 +88,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		sysUserDao.insert(sysUser);
 
 		if(StringUtils.isEmpty(currentOrganization.getParentOrganIdTag())){
-			organ.setParentOrganIdTag(user.getId().toString());
+			organ.setParentOrganIdTag(queryUserInfo.getId().toString());
 		}else {
-			organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + user.getId());
+			organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + queryUserInfo.getId());
 		}
 		organ.setId(sysUser.getId());
 		organDao.insert(organ);