Commit 60065f11 authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch '227-brapi-error' into 'master'

BrAPI error

Closes #227

See merge request genesys-pgr/genesys-server!128
parents f5626dba 6d67b951
......@@ -119,6 +119,10 @@ public class DirectMysqlQuery {
if (filters.hasFilter(FilterConstants.CROPS)) {
innerJoin("crop", null, "crop.id=a.cropId");
}
if (filters.hasFilter(FilterConstants.UUID)) {
innerJoin("acce", null, "acce.id=a.id");
}
if (filters.hasFilter(FilterConstants.PDCI)) {
innerJoin("pdci", null, "pdci.accessionId=a.id");
......@@ -165,7 +169,7 @@ public class DirectMysqlQuery {
protected DirectMysqlQuery filter(AppliedFilters filters, MethodResolver methodResolver) {
createQuery(whereBuffer, "a.id", filters.get(FilterConstants.ID), params);
createQuery(whereBuffer, "a.uuid", filters.get(FilterConstants.UUID), params);
createQuery(whereBuffer, "acce.uuid", filters.get(FilterConstants.UUID), params);
{
// FIXME Are these two still used?
createQuery(whereBuffer, "t.taxGenus", filters.get("genusId"), params);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment