#183 added the where filter

ePareto-Information-System · Jan 9, 2025 · eafe776 · eafe776
1 parent d990198
commit eafe776
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/ebs/EbsFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/ebs/EbsFacadeEjb.java
@@ -50,8 +50,6 @@
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
-import de.symeda.sormas.api.ebs.SignalVerificationDto;
-import de.symeda.sormas.api.ebs.TriagingDto;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -71,6 +69,8 @@
 import de.symeda.sormas.api.ebs.EbsIndexDto;
 import de.symeda.sormas.api.ebs.EbsReferenceDto;
 import de.symeda.sormas.api.ebs.SignalOutcome;
+import de.symeda.sormas.api.ebs.SignalVerificationDto;
+import de.symeda.sormas.api.ebs.TriagingDto;
 import de.symeda.sormas.api.externaldata.ExternalDataDto;
 import de.symeda.sormas.api.externaldata.ExternalDataUpdateException;
 import de.symeda.sormas.api.externalsurveillancetool.ExternalSurveillanceToolException;
@@ -460,6 +460,9 @@ public List<EbsIndexDto> getIndexList(EbsCriteria ebsCriteria, Integer first, In
 				Predicate criteriaFilter = service.buildCriteriaFilter(ebsCriteria, ebsQueryContext);
 				filter = CriteriaBuilderHelper.and(cb, filter, criteriaFilter);
 			}
+			if (filter != null) {
+				cq.where(filter);
+			}
 
 			sortBy(sortProperties, ebsQueryContext);
 			cq.distinct(true);