From da22af62f04c91cf188271e86ae60ccdf5168f2f Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 29 Jan 2020 07:43:10 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1051082][Contact:
Create: Mehrere Fehlermeldungen]
---
.../recordcontainers/jdito/contentProcess.js | 20 ++++++++++++++-----
.../recordcontainers/jdito/contentProcess.js | 14 +++++++++++--
2 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/entity/SalutationDistinct_entity/recordcontainers/jdito/contentProcess.js b/entity/SalutationDistinct_entity/recordcontainers/jdito/contentProcess.js
index 74bdbab553..a2474449b4 100644
--- a/entity/SalutationDistinct_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/SalutationDistinct_entity/recordcontainers/jdito/contentProcess.js
@@ -1,8 +1,18 @@
+import("system.vars");
import("system.result");
import("Sql_lib");
-result.object(newSelect("distinct SALUTATION")
- .from("SALUTATION")
- .whereIfSet("SALUTATION.ISOLANGUAGE", "$param.Language_param")
- .and("SALUTATION is not NULL")
- .table());
\ No newline at end of file
+var idValues = vars.get("$local.idvalues");
+var res;
+if (idValues)
+ res = idValues.map(function (uid){
+ return [uid];
+ });
+else
+ res = newSelect("distinct SALUTATION")
+ .from("SALUTATION")
+ .whereIfSet("SALUTATION.ISOLANGUAGE", "$param.Language_param")
+ .and("SALUTATION is not NULL")
+ .table();
+
+result.object(res);
\ No newline at end of file
diff --git a/entity/SalutationTitleDistinct_entity/recordcontainers/jdito/contentProcess.js b/entity/SalutationTitleDistinct_entity/recordcontainers/jdito/contentProcess.js
index 4ed5169cb7..1dc6c69470 100644
--- a/entity/SalutationTitleDistinct_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/SalutationTitleDistinct_entity/recordcontainers/jdito/contentProcess.js
@@ -1,9 +1,19 @@
+import("system.vars");
import("system.result");
import("Sql_lib");
-result.object(newSelect("distinct TITLE")
+var idValues = vars.get("$local.idvalues");
+var res;
+if (idValues)
+ res = idValues.map(function (uid){
+ return [uid];
+ });
+else
+ res = newSelect("distinct TITLE")
.from("SALUTATION")
.whereIfSet("SALUTATION.SALUTATION", "$param.Salutation_param")
.andIfSet("SALUTATION.ISOLANGUAGE", "$param.Language_param")
.and("TITLE is not NULL")
- .table());
\ No newline at end of file
+ .table();
+
+result.object(res);
\ No newline at end of file
--
GitLab