涂煌豪
2022-03-18 d532cb2e521ff1a418abe343994fb2792af9d344
Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
1个文件已修改
19 ■■■■ 已修改文件
force-app/main/default/classes/ContactTriggerHandler.cls 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/ContactTriggerHandler.cls
@@ -376,7 +376,7 @@
                    // 医院 客户人员 统一平台编码有值 发送 PO
                    if ('01210000000QfWdAAK'.equals(local.RecordTypeId) && String.isNotBlank(local.UnifiedI_Contact_ID__c)) {
                        if (!NFM606_IdMap.containsKey(local.Id)) {
                            if(UserInfo.getUserId().equals(System.Label.interfaceUserID)){
                            if(UserInfo.getProfileId().equals(System.Label.ProfileId_SystemAdmin)){
                                interfaceUserUpsertContact.add(local.Id);
                            } else {
                                contactIdList.add(local.Id);
@@ -387,7 +387,7 @@
                    // 经销商 客户人员 手机号码有值 发送 PO
                    if ('01210000000QfWiAAK'.equals(local.RecordTypeId) && String.isNotBlank(local.MobilePhone)) {
                        if (!NFM606_IdMap.containsKey(local.Id)) {
                            if(UserInfo.getUserId().equals(System.Label.interfaceUserID)){
                            if(UserInfo.getProfileId().equals(System.Label.ProfileId_SystemAdmin)){
                                interfaceUserUpsertContact.add(local.Id);
                            } else {
                                contactIdList.add(local.Id);
@@ -403,21 +403,10 @@
        if(!System.Test.isRunningTest()){
            // NFM606Controller.executeNotFuture('', contactIdList);
            if (contactIdList.size() > 0) {
                // 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
                NFM606Controller.callout('', contactIdList);
            }
            if (interfaceUserUpsertContact.size() > 0) {
                // 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
                NFM606Controller.executeNotFuture('', interfaceUserUpsertContact);
            }
        }