diff --git a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js index 048079355f477ee6f3f123b68773f324ba5df07d..330c111ddaf227ff0f2e052eb6e9aea31a187eaf 100644 --- a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js +++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js @@ -51,7 +51,7 @@ var names = []; for (let begin = 0, max = contactIds.length; begin < max; begin += idsPerPage) { - names = names.concat(newSelect("CONTACTID, " + selectExpression) + names = names.concat(newSelect(["CONTACTID", selectExpression]) .from("CONTACT") .leftJoin("PERSON", "(PERSON.PERSONID = CONTACT.PERSON_ID)") .whereIfSet("CONTACT.CONTACTID", contactIds.slice(begin, begin + idsPerPage), SqlBuilder.IN()) diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js index 9318128f13327f16af2c3c65c7780f650fc1be11..243a9e86c4e2472e8b9ff14ecfa3885c1fe28a31 100644 --- a/process/Bulkmail_lib/process.js +++ b/process/Bulkmail_lib/process.js @@ -122,11 +122,11 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pTestRecipients) } } - newWhereIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", successIds, SqlBuilder.In()) + newWhereIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", successIds, SqlBuilder.IN()) .updateData(true, "BULKMAILRECIPIENT", ["STATUS", "SENTDATE"], null, [$KeywordRegistry.bulkMailRecipientStatus$sent(), sentDate]); - newWhereIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", failedIds, SqlBuilder.In()) + newWhereIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", failedIds, SqlBuilder.IN()) .updateData(true, "BULKMAILRECIPIENT", ["STATUS", "SENTDATE"], null, [$KeywordRegistry.bulkMailRecipientStatus$failed(), sentDate]); if (!pTestRecipients) //if its just a test run, don't set the status to sent