From 0ceb19e2040e103a17a9a077b2001541b3bf34e0 Mon Sep 17 00:00:00 2001 From: Pradeep Nayak Date: Fri, 19 Oct 2018 00:16:17 +0530 Subject: [PATCH] fixed sql --- CRM/ConstituentsOnly/BAO/Query.php | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/CRM/ConstituentsOnly/BAO/Query.php b/CRM/ConstituentsOnly/BAO/Query.php index fbe68b2..6bcac88 100644 --- a/CRM/ConstituentsOnly/BAO/Query.php +++ b/CRM/ConstituentsOnly/BAO/Query.php @@ -56,16 +56,18 @@ class CRM_ConstituentsOnly_BAO_Query extends CRM_Contact_BAO_Query_Interface { if (CRM_Utils_Array::value('civicrm_contact', $query->_tables) && empty($query->_paramLookup['do_not_trade'])) { $query->_where[0][] = " - IF (contact_a.do_not_trade = 1, - CASE - WHEN (cr.id IS NULL OR cc1.is_deleted = 1 OR cc1.do_not_trade = 1) - THEN 0 - ELSE 1 - END, - 1) + contact_a.id NOT IN (SELECT contact_a.id + FROM civicrm_contact contact_a + LEFT JOIN civicrm_relationship cr + ON (cr.contact_id_a = contact_a.id OR cr.contact_id_b = contact_a.id) + AND cr.is_active = 1 + LEFT JOIN civicrm_contact cc1 + ON (cr.contact_id_a = cc1.id OR cr.contact_id_b = cc1.id) + AND contact_a.id <> cc1.id AND cr.is_active = 1 + WHERE contact_a.do_not_trade = 1 AND (cr.id IS NULL OR cc1.is_deleted = 1 OR cc1.do_not_trade = 1) + GROUP by contact_a.id + ) "; - $query->_tables['civicrm_do_not_trade'] = 1; - $query->_whereTables['civicrm_do_not_trade'] = 1; } } @@ -76,13 +78,6 @@ class CRM_ConstituentsOnly_BAO_Query extends CRM_Contact_BAO_Query_Interface { * */ public function from($name, $mode, $side) { - if ($name == 'civicrm_do_not_trade') { - return " LEFT JOIN civicrm_relationship cr - ON (cr.contact_id_a = contact_a.id OR cr.contact_id_b = contact_a.id) - LEFT JOIN civicrm_contact cc1 - ON (cr.contact_id_a = cc1.id OR cr.contact_id_b = cc1.id) - AND contact_a.id <> cc1.id"; - } } /**