From 99fc3df7fa4143a408b2a640e84b1a23ea45d82c Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Wed, 15 May 2019 09:36:05 +0300
Subject: [PATCH] Fixes bug when fetching the Organisations.

---
 .../java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java
index ef634dd85..4240840f4 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java
@@ -31,7 +31,7 @@ public class OrganisationDaoImpl extends DatabaseAccess<Organisation> implements
         if (criteria.getLabelLike() != null) {
             query.where((builder, root) -> builder.like(builder.upper(root.get("label")), "%" + criteria.getLabelLike().toUpperCase() + "%"));
         }
-        if (criteria.getPublic()) {
+        if (criteria.getPublic() != null && criteria.getPublic()) {
             query.where((builder, root) -> builder.equal(root.join("dmps", JoinType.LEFT).get("status"), DMP.DMPStatus.FINALISED.getValue()));
         }
         return query;