fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

 force-app/main/default/triggers/FileAddressTrigger.trigger

@@ -6,10 +6,10 @@
            deleteFiles.add(fd.AWS_File_Key__c);
        } 
    }
    if(!deleteFiles.isEmpty()&&(!System.isFuture()||System.isBatch())){
        system.debug('DeleteFiles Value:'+JSON.serialize(deleteFiles));
        if(!Test.isRunningTest()){
            AWSServiceTool.deleteFileAddress(deleteFiles);
        }        
    }  
        if(!deleteFiles.isEmpty()&&(!System.isFuture() && !System.isBatch())){
            system.debug('DeleteFiles Value:'+JSON.serialize(deleteFiles));
            if(!Test.isRunningTest()){
                AWSServiceTool.deleteFileAddress(deleteFiles);
            }        
        }  
}