Merge pull request #687 from Shilpa-Manjunath/locdev

Mosip 19954 Issue when we create a location with the same name with d…
mosip · Mar 9, 2022 · 2a82d78 · 2a82d78
2 parents 0b28f84 + 7465eb4
commit 2a82d78
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
@@ -135,7 +135,7 @@ List<Location> findLocationByHierarchyLevelStartsWith(Short hierarchyLevel, Stri
 	@Query("FROM Location l WHERE l.name=?1 AND l.hierarchyLevel=?2 ")
 	List<Location> findByNameAndLevel(String name, Short hierarchyLevel);
 
-	@Query("FROM Location l WHERE l.name=?1 AND l.hierarchyLevel=?2 AND l.langCode=?3")
+	@Query("FROM Location l WHERE l.name=?1 AND l.hierarchyLevel=?2 AND l.langCode=?3 and (l.isDeleted is null or l.isDeleted=false)")
 	List<Location> findByNameAndLevelLangCode(String name, Short hierarchyLevel, String langCode);
 
 	@Query("FROM Location l WHERE l.name=?1 AND l.hierarchyLevel=?2 AND l.langCode=?3 AND NOT code=?4")