From 01f207d979d6be17c8cdec293feab48828c0ec3e Mon Sep 17 00:00:00 2001 From: 黄千龙 <huangqianlong@prec-tech.com> Date: 星期五, 08 四月 2022 14:22:52 +0800 Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG --- force-app/main/default/classes/AWSServiceTool.cls | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/force-app/main/default/classes/AWSServiceTool.cls b/force-app/main/default/classes/AWSServiceTool.cls index 0c2e0ba..1e6c813 100644 --- a/force-app/main/default/classes/AWSServiceTool.cls +++ b/force-app/main/default/classes/AWSServiceTool.cls @@ -8,6 +8,21 @@ * * */ public without sharing class AWSServiceTool { + public static List<Contact> getNoPIContact(String searchContactName,String accountId){ + if(searchContactName!='' || accountId!=''){ + String noPISQL = 'select Id,Name,Email,Phone,Account.Name,MobilePhone from Contact where Account_Record_Type_DeveloperName__c in('+'\'Agency\''+','+'\'Office\''+',\'AgencyContact\''+')'; + if(String.isNotEmpty(accountId)){ + noPISQL += ' and AccountId=\''+accountId+'\''; + } + if(String.isNotEmpty(searchContactName)){ + noPISQL += ' and Name like \'%'+searchContactName+'%\''; + } + system.debug('noPISQL = ' + noPISQL); + List<Contact> partnerContactList = Database.query(noPISQL); + return partnerContactList; + } + return new List<Contact>(); + } public static String getAWSToken(){ AWS_Integration_Info__mdt awsConfiguration = [SELECT App_Id__c,Token_URL__c,App_Secret__c,Host_URL__c FROM AWS_Integration_Info__mdt WHERE DeveloperName = 'AWS_Default_Configuration']; if (awsConfiguration == null) { @@ -21,6 +36,9 @@ String url = awsConfiguration.Token_URL__c; request.setEndpoint(url); request.setMethod('GET'); + if(Test.isRunningTest()){ + return 'UTToken'; + } HttpResponse response = http.send(request); Map<String, Object> results = (Map<String, Object>) JSON.deserializeUntyped(response.getBody()); String token = (String)results.get('object'); -- Gitblit v1.9.1