From 61e65a13c5a7833cacadcd35d015d6dff084cb57 Mon Sep 17 00:00:00 2001 From: Matija Obreza Date: Thu, 13 Aug 2020 13:56:33 +0200 Subject: [PATCH] Fix: Added missing fetch join RepositoryFile in find*Attachments() --- .../AccessionInvAttachRepositoryCustomImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gringlobal/persistence/AccessionInvAttachRepositoryCustomImpl.java b/src/main/java/org/gringlobal/persistence/AccessionInvAttachRepositoryCustomImpl.java index 1ccaf840..2fc5c305 100644 --- a/src/main/java/org/gringlobal/persistence/AccessionInvAttachRepositoryCustomImpl.java +++ b/src/main/java/org/gringlobal/persistence/AccessionInvAttachRepositoryCustomImpl.java @@ -38,15 +38,20 @@ public class AccessionInvAttachRepositoryCustomImpl implements AccessionInvAttac @Override public List findAccessionAttachments(Accession accession, String formTypeCode) { BooleanExpression expression = QAccessionInvAttach.accessionInvAttach.inventory.accession.eq(accession); + if (StringUtils.isNotBlank(formTypeCode)) { expression = expression.and(QAccessionInvAttach.accessionInvAttach.inventory.formTypeCode.eq(formTypeCode)); } - return jpaQueryFactory.selectFrom(QAccessionInvAttach.accessionInvAttach).where(expression).fetch(); + + return jpaQueryFactory.selectFrom(QAccessionInvAttach.accessionInvAttach) + .join(QAccessionInvAttach.accessionInvAttach.repositoryFile).fetchJoin() + .where(expression).fetch(); } @Override public List findInventoryAttachments(Inventory inventory) { return jpaQueryFactory.selectFrom(QAccessionInvAttach.accessionInvAttach) + .join(QAccessionInvAttach.accessionInvAttach.repositoryFile).fetchJoin() .where(QAccessionInvAttach.accessionInvAttach.inventory.eq(inventory)).fetch(); } } -- GitLab