diff --git a/src/main/java/org/gringlobal/persistence/AccessionInvAttachRepositoryCustomImpl.java b/src/main/java/org/gringlobal/persistence/AccessionInvAttachRepositoryCustomImpl.java index 1ccaf840421b3ba288ffb271cfb55d959c68e032..2fc5c305cd530f0ed40e6a14c75a545ac1c187c4 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(); } }