Resolve Conflicts

This commit is contained in:
rajesh
2024-11-26 17:11:43 +05:30
19 changed files with 521 additions and 327 deletions

View File

@@ -134,7 +134,7 @@ public class DocumentDao {
}
public DocumentEntity validateDocument(Long id) {
return documentRepository.findById(id).orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
return documentRepository.findByIdAndNotDeleted(id).orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND)));
}