Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OrganizationServiceImpl.java

@@ -217,7 +217,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 
 	@Override
 	public List<Organization> queryAll() {
-		return organizationDao.queryEmployeeOrgan(null);
+		return organizationDao.getOrgans(null,1);
 	}
 
 	@Transactional(rollbackFor = Exception.class)