From e87e2858c66333a333b0cdfa42f0b5aaa5663a0d Mon Sep 17 00:00:00 2001 From: "j.goderbauer" <j.goderbauer@adito.de> Date: Wed, 5 Feb 2020 08:34:50 +0000 Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1051679][Falsche Zuweisung in person_entity.db.conditionProcess] (cherry picked from commit 9c2597927e9e2a3fef0af312cdceec2f8d0a3bb9) --- entity/Person_entity/recordcontainers/db/conditionProcess.js | 2 +- process/Sql_lib/documentation.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/entity/Person_entity/recordcontainers/db/conditionProcess.js b/entity/Person_entity/recordcontainers/db/conditionProcess.js index 100f909cbf3..a856eee0c29 100644 --- a/entity/Person_entity/recordcontainers/db/conditionProcess.js +++ b/entity/Person_entity/recordcontainers/db/conditionProcess.js @@ -9,7 +9,7 @@ import("system.result"); import("Sql_lib"); var cond = newWhereIfSet("CONTACT.ORGANISATION_ID", "$param.OrgId_param") - .andIfSet("PERSON.CONTACT_ID", "$param.ContactId_param"); + .andIfSet("CONTACT.CONTACTID", "$param.ContactId_param"); if (vars.exists("$param.ExcludedContactIds_param") && vars.get("$param.ExcludedContactIds_param")) { diff --git a/process/Sql_lib/documentation.adoc b/process/Sql_lib/documentation.adoc index c3695fa62fe..2017f4b9646 100644 --- a/process/Sql_lib/documentation.adoc +++ b/process/Sql_lib/documentation.adoc @@ -501,7 +501,7 @@ Here is an example code of a conditionProcess: // newWhereIfSet() is used to create a new condition. // The 'IfSet' ignores the condition "CONTACT.ORGANISATION_ID" = "$param.OrgId_param" if "$param.OrgId_param" is null var cond = newWhereIfSet("CONTACT.ORGANISATION_ID", "$param.OrgId_param") - .andIfSet("PERSON.CONTACT_ID", "$param.ContactId_param"); // if "$param.ContactId_param" is null, this line is ignored + .andIfSet("CONTACT.CONTACTID", "$param.ContactId_param"); // if "$param.ContactId_param" is null, this line is ignored // --> If both parameters are null (not filled), then the SqlBuilder condition will not contain any condition! // Now we add a parameter containing a json Array -- GitLab