Merge remote-tracking branch 'origin/master'

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

@@ -168,6 +168,12 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		if(null == organization1){
 			throw new BizException("合作商信息不存在");
 		}
+		//获取父级的organ
+		if(organization.getIsAllowArrangeExam() == 1){
+			if(organization1.getIsAllowArrangeExam() == 0){
+				throw new BizException("无权创建可排考的合作单位");
+			}
+		}
 		sysUser.setId(organization1.getUserId());
 //		organization.setId(sysUser.getId());
 		if(StringUtils.isNotEmpty(sysUser.getPhone())){