From f127c76b19f5316032d4bed127a1dde710c48d74 Mon Sep 17 00:00:00 2001 From: Li Jun <buli@deloitte.com.cn> Date: 星期四, 24 三月 2022 10:10:36 +0800 Subject: [PATCH] PIPLFunctionFixBug0324 --- force-app/main/default/classes/ContactTriggerHandler.cls | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/force-app/main/default/classes/ContactTriggerHandler.cls b/force-app/main/default/classes/ContactTriggerHandler.cls index 706b3c3..f5f46f9 100644 --- a/force-app/main/default/classes/ContactTriggerHandler.cls +++ b/force-app/main/default/classes/ContactTriggerHandler.cls @@ -295,6 +295,9 @@ String firstNameStr = String.isNotBlank(contact.FirstName) ? contact.FirstName:''; String contactFullName = lastNameStr + firstNameStr; contactFullName = contact.LastName_Encrypted__c;// 20220314 PI鏀归�� by Bright + if(string.isBlank(contactFullName)){ + continue; + } String accountId = String.valueOf(contact.AccountId).SubString(0,15); Map<String,Contact> contactFullNameMap = new Map<String,Contact>(); if (accountContactMap.containsKey(accountId)) { @@ -400,10 +403,21 @@ if(!System.Test.isRunningTest()){ // NFM606Controller.executeNotFuture('', contactIdList); if (contactIdList.size() > 0) { - NFM606Controller.callout('', contactIdList); + // NFM606Controller.callout('', contactIdList); + //娣诲姞future 鍒ゆ柇 add for pipl sushanhu 20220317 start + if (!(System.isFuture()||System.isBatch())) { + NFM606Controller.callout('', contactIdList); + } + //娣诲姞future 鍒ゆ柇 add for pipl sushanhu 20220317 end } if (interfaceUserUpsertContact.size() > 0) { - NFM606Controller.executeNotFuture('', interfaceUserUpsertContact); + // NFM606Controller.executeNotFuture('', interfaceUserUpsertContact); + //娣诲姞future 鍒ゆ柇 add for pipl sushanhu 20220316 start + if (!(System.isFuture()||System.isBatch())) { + NFM606Controller.executeNotFuture('', interfaceUserUpsertContact); + } + //娣诲姞future 鍒ゆ柇 add for pipl sushanhu 20220316 end + } } -- Gitblit v1.9.1