Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

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

@@ -83,7 +83,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
 
-		List<Integer> nextLevelOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
+		List<Integer> nextLevelOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), false);
 		params.put("organIds", nextLevelOrganIds);
 
 		List<ExamOrganizationRelationExtraDto> dataList = new ArrayList<>();

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

@@ -214,7 +214,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 			selfAndChildOrganIds.remove(organization.getId());
 		}
 		if(CollectionUtils.isEmpty(selfAndChildOrganIds)){
-			return null;
+			selfAndChildOrganIds.add(0);
 		}
 		return selfAndChildOrganIds;
 	}