diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js index e3d046f16d51df23bcd633d675f272178d03c807..91f41d2376a34789093319e80eb2ff06429ad0db 100644 --- a/process/Contact_lib/process.js +++ b/process/Contact_lib/process.js @@ -1,3 +1,4 @@ +import("system.logging"); import("EmailUtil_lib"); import("Organisation_lib"); import("Employee_lib"); @@ -840,7 +841,8 @@ ContactUtils.getContactSalutationSubSql = function(pGetHeadline, pGetLetterSalut } } - return newSelect("case when CONTACT.PERSON_ID is null then " + salutationColumn + " else " + personSelect + "end") + return sqlHelper.isNull( + "(" + newSelect("case when CONTACT.PERSON_ID is null then " + salutationColumn + " else " + personSelect + "end") .from("SALUTATION") .where("SALUTATION.ISOLANGUAGE = CONTACT.ISOLANGUAGE") .and(newWhere("SALUTATION.SEX = PERSON.GENDER").or("SALUTATION.SEX is null")) @@ -848,7 +850,9 @@ ContactUtils.getContactSalutationSubSql = function(pGetHeadline, pGetLetterSalut .and(newWhere("SALUTATION.SALUTATION = PERSON.SALUTATION").or("SALUTATION.SALUTATION is null")) .orderBy("SALUTATION.SEX desc, SALUTATION.TITLE desc") .toString() - + " " + sqlHelper.limit(1); + + " " + sqlHelper.limit(1) + + ")" + , sqlHelper.concatWithSeparator(["PERSON.TITLE", "PERSON.FIRSTNAME", "PERSON.LASTNAME"], " ")); } /**