fix: Remove unnecessary calls to the DB during DataValueSet import [D…

…HIS2-16159]
dhis2 · Nov 14, 2023 · cbf9d3f · cbf9d3f
1 parent bc2befc
commit cbf9d3f
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/...rvice-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetImportValidator.java b/...rvice-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetImportValidator.java
@@ -645,8 +645,7 @@ private void checkDataValueOrgUnitValidForAttrOptionCombo(
 
   private boolean isOrgUnitValidForAttrOptionCombo(DataValueContext valueContext) {
     Set<OrganisationUnit> aocOrgUnits = valueContext.getAttrOptionCombo().getOrganisationUnits();
-    return aocOrgUnits == null
-        || organisationUnitService.isDescendant(valueContext.getOrgUnit(), aocOrgUnits);
+    return aocOrgUnits == null || valueContext.getOrgUnit().isDescendant(aocOrgUnits);
   }
 
   private static void checkDataValueTargetDataSets(