Merge pull request #833 from balaji-alluru/newbranch

Updated LocationRepository
mosip · Nov 24, 2022 · 14115a5 · 14115a5
2 parents 4c7c6bc + 2a72034
commit 14115a5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...rdata-service/src/main/java/io/mosip/kernel/masterdata/repository/LocationRepository.java b/...rdata-service/src/main/java/io/mosip/kernel/masterdata/repository/LocationRepository.java
@@ -145,7 +145,7 @@ List<Location> findLocationByHierarchyLevelStartsWith(Short hierarchyLevel, Stri
 	@Query("FROM Location l WHERE l.name=?1 AND l.hierarchyLevel=?2 AND l.langCode=?3 AND NOT code=?4")
 	List<Location> findByNameAndLevelLangCodeNotCode(String name,Short hierarchyLevel, String langCode, String code);
 
-	@Query("FROM Location l WHERE l.name=?1 AND l.parentLocCode=?5 AND l.hierarchyLevel=?2 AND l.langCode=?3 AND NOT code=?4")
+	@Query("FROM Location l WHERE l.name=?1 AND l.parentLocCode=?5 AND l.hierarchyLevel=?2 AND l.langCode=?3 AND NOT code=?4 AND (l.isDeleted is null or l.isDeleted=false)")
 	List<Location> findByNameParentlocCodeAndLevelLangCodeNotCode(String name,Short hierarchyLevel, String langCode, String code,String parentLocCode);