From d1a86a37f2d1d27c9bd0e956d54d4902b98a7a6a Mon Sep 17 00:00:00 2001
From: Sascha Schmidt <s.schmidt@adito.de>
Date: Fri, 11 Oct 2019 17:35:27 +0200
Subject: [PATCH] fix #1045265 campaign: update steps action only updated
person-contacts but not organisation-contacts
---
process/Campaign_lib/process.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/process/Campaign_lib/process.js b/process/Campaign_lib/process.js
index 48bc233b1a..4021c65e1c 100644
--- a/process/Campaign_lib/process.js
+++ b/process/Campaign_lib/process.js
@@ -357,13 +357,13 @@ CampaignUtils.GetContactIdsNotInCampaignByCondition = function(pCampaignId, pCon
CampaignUtils.GetContactIdsInCampaignByCondition = function(pCampaignId, pCondition, pRightJoinContacts)
{
- let query = "select CONTACT.CONTACTID from PERSON"
+ let query = "select CONTACT.CONTACTID from CONTACT"
- if(pRightJoinContacts == "true")
- query += " right"
+// if(pRightJoinContacts == "true")
+// query += " right"
- query += " join CONTACT on (CONTACT.PERSON_ID = PERSON.PERSONID)"
- + " join ORGANISATION on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID)"
+ query += " left join PERSON on (CONTACT.PERSON_ID = PERSON.PERSONID)"
+ + " left join ORGANISATION on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID)"
+ " left join ADDRESS on (ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID)"
+ " left join CAMPAIGNPARTICIPANT on CAMPAIGNPARTICIPANT.CONTACT_ID = CONTACT.CONTACTID"
+ " where " + pCondition
--
GitLab