Merge remote-tracking branch 'origin/master'

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

@@ -55,7 +55,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	public void add(Organization organ) {
 		//获取当前用的organ
 		SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
-		Organization currentOrganization = organDao.get(queryUserInfo.getId());
+		Organization currentOrganization = organDao.findByUserId(queryUserInfo.getId());
 		//获取父级的organ
 		if(organ.getIsAllowArrangeExam() == 1){
 			if(currentOrganization.getIsAllowArrangeExam() == 0){
@@ -67,7 +67,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 //		organ.setTenantId(tenantId);
 //		sysUser.setTenantId(tenantId);
 		SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
-		organ.setParentOrganId(queryUserInfo.getId());
+		organ.setParentOrganId(currentOrganization.getId());
 		organ.setLevel(currentOrganization.getLevel() + 1);
 
 		if(user != null && user.getId() != null){