From eeb7c0a2d6f037d515bb822d739036b69c4dc73a Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期五, 08 四月 2022 17:14:12 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/classes/SearchVisitorController.cls | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/SearchVisitorController.cls b/force-app/main/default/classes/SearchVisitorController.cls
index 2a48b1b..2708850 100644
--- a/force-app/main/default/classes/SearchVisitorController.cls
+++ b/force-app/main/default/classes/SearchVisitorController.cls
@@ -32,6 +32,7 @@
public String contactAWSIds {set;get;}
public String contactsInfo {set;get;}
public String awsDataIdArray {set;get;}
+ public String sfContactId{set;get;}
//Add By Li Jun 20220217 End
public SearchVisitorController(){
@@ -174,18 +175,25 @@
//Add By Li Jun for PIPL 20220217 Start
//1. Query Contact by accountId
List<Contact> conList = new List<Contact>();
+ List<Account> departmentClass = new List<Account>();
system.debug('Account Id from Front-end:'+a.Id);
String accountId = a.Id;
+ PIHelper.PIIntegration contactPIIntegration = PIHelper.getPIIntegrationInfo('Contact');
if(String.isNotBlank(accountId) && String.isNotEmpty(accountId)){
- conList = new List<Contact>([select Id,AWS_Data_Id__c from Contact where AccountId=:accountId and AWS_Data_Id__c!='']);
+ departmentClass = [select Department_Class__c from Account where id =:accountId];
+ if(departmentClass.size() > 0){
+ conList = new List<Contact>([select Id,AWS_Data_Id__c from Contact where Strategic_dept_Class__c=:departmentClass[0].Department_Class__c and AWS_Data_Id__c!='' limit :contactPIIntegration.maxQueryNumber]);
+ }
+ //conList = new List<Contact>([select Id,AWS_Data_Id__c from Contact where AccountId=:accountId and AWS_Data_Id__c!='' limit :contactPIIntegration.maxQueryNumber]);
}
//2. Prepare the Contact Info
List<String> conAWSIds = new List<String>();
+ system.debug('Contact Size:'+conList.size());
for(Contact con:conList){
conAWSIds.add(con.AWS_Data_Id__c);
}
contactAWSIds = JSON.serialize(conAWSIds);
- staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Contact'));
+ staticResource = JSON.serialize(contactPIIntegration);
//Add By Li Jun for PIPL 20220217 End
}
//Add by Li Jun for PIPL 202202117 Start
@@ -399,7 +407,9 @@
Savepoint sp = Database.setSavepoint();
try{
+ system.debug('rc = ' + rc);
upsert rc;
+ sfContactId = rc.Id;
}catch(Exception io){
Database.rollback(sp);
return null;
--
Gitblit v1.9.1