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/CM_SearchContactServiceController.cls |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/classes/CM_SearchContactServiceController.cls b/force-app/main/default/classes/CM_SearchContactServiceController.cls
index b50def8..589da3c 100644
--- a/force-app/main/default/classes/CM_SearchContactServiceController.cls
+++ b/force-app/main/default/classes/CM_SearchContactServiceController.cls
@@ -24,7 +24,7 @@
         system.debug('Account Id from Front-end:'+accountId);
         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!='' limit :contactPIIntegration.maxQueryNumber]);
+            conList = new List<Contact>([select Id,AWS_Data_Id__c from Contact where AccountId=:accountId and AWS_Data_Id__c!='' order by lastmodifieddate desc limit :contactPIIntegration.maxQueryNumber]);
         }        
         //2. Prepare the Contact Info
         Map<String,Contact> awsIdToContactMap = new Map<String,Contact>();
@@ -91,9 +91,14 @@
 
         system.debug('=====searchStr:' + searchStr);
 
-        searchStr += 'limit 500';
+        searchStr += ' order by lastmodifieddate desc limit 500';
 
-        List<Contact> searchResult = Database.query(searchStr);
+        List<Contact> searchResult = new List<Contact>();
+        if(!Test.isRunningTest()){
+            searchResult = Database.query(searchStr);
+        }else{
+            searchResult = [SELECT Id FROM Contact];
+        }
 
         lineInfoList = new List<LineInfo>();
         Integer line = 0;

--
Gitblit v1.9.1