Fixes bug on "Dataset Specification" criteria of "Published DMPs".
This commit is contained in:
parent
0a920fa17e
commit
5285c1a3a6
|
@ -30,7 +30,7 @@ public class DataManagmentPlanPublicTableRequest extends TableQuery<DataManageme
|
||||||
, builder.isNull(root.get("grant").get("enddate"))));
|
, builder.isNull(root.get("grant").get("enddate"))));
|
||||||
}
|
}
|
||||||
if (this.getCriteria().datasetProfile != null && !this.getCriteria().datasetProfile.isEmpty())
|
if (this.getCriteria().datasetProfile != null && !this.getCriteria().datasetProfile.isEmpty())
|
||||||
query.where(((builder, root) -> root.get("profile").get("id").in(this.getCriteria().datasetProfile)));
|
query.where((builder, root) -> root.join("associatedDmps").get("id").in(this.getCriteria().datasetProfile));
|
||||||
if (this.getCriteria().getDmpOrganisations() != null && !this.getCriteria().getDmpOrganisations().isEmpty())
|
if (this.getCriteria().getDmpOrganisations() != null && !this.getCriteria().getDmpOrganisations().isEmpty())
|
||||||
query.where(((builder, root) -> root.join("organisations").get("reference").in(this.getCriteria().getDmpOrganisations())));
|
query.where(((builder, root) -> root.join("organisations").get("reference").in(this.getCriteria().getDmpOrganisations())));
|
||||||
return query;
|
return query;
|
||||||
|
|
Loading…
Reference in New Issue