diff --git a/src/main/java/DNPM/services/DefaultStudienService.java b/src/main/java/DNPM/services/DefaultStudienService.java index 9f2ca05..99af071 100644 --- a/src/main/java/DNPM/services/DefaultStudienService.java +++ b/src/main/java/DNPM/services/DefaultStudienService.java @@ -20,8 +20,8 @@ public class DefaultStudienService implements StudienService { var sql = "SELECT property_catalogue_version.version_number, studie.studien_nummer, pcve.code, pcve.shortdesc, pcve.description FROM property_catalogue " + "JOIN property_catalogue_version ON property_catalogue.id = property_catalogue_version.datacatalog_id " + "JOIN property_catalogue_version_entry pcve ON property_catalogue_version.id = pcve.property_version_id " - + "LEFT JOIN studie ON pcve.id = studie.property_version_entry " - + "WHERE property_catalogue.name = 'OS.Studien' AND s.aktiv;"; + + "LEFT JOIN studie ON pcve.id = studie.property_version_entry AND studie.aktiv " + + "WHERE property_catalogue.name = 'OS.Studien';"; return this.jdbcTemplate.query(sql, (resultSet, i) -> new Studie( resultSet.getString(1), @@ -37,8 +37,8 @@ public class DefaultStudienService implements StudienService { var sql = "SELECT property_catalogue_version.version_number, studie.studien_nummer, pcve.code, pcve.shortdesc, pcve.description FROM property_catalogue " + "JOIN property_catalogue_version ON property_catalogue.id = property_catalogue_version.datacatalog_id " + "JOIN property_catalogue_version_entry pcve ON property_catalogue_version.id = pcve.property_version_id " - + "LEFT JOIN studie ON pcve.id = studie.property_version_entry " - + "WHERE property_catalogue.name = 'OS.Studien' AND studie.aktiv AND (pcve.shortdesc LIKE ? OR pcve.description LIKE ?);"; + + "LEFT JOIN studie ON pcve.id = studie.property_version_entry AND studie.aktiv " + + "WHERE property_catalogue.name = 'OS.Studien' AND (pcve.shortdesc LIKE ? OR pcve.description LIKE ?);"; var like = String.format("%%%s%%", query);