From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/triggers/AccountTrigger.trigger | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/triggers/AccountTrigger.trigger b/force-app/main/default/triggers/AccountTrigger.trigger
index e1fa5c8..d46f336 100644
--- a/force-app/main/default/triggers/AccountTrigger.trigger
+++ b/force-app/main/default/triggers/AccountTrigger.trigger
@@ -2,10 +2,7 @@
* 瀹㈡埛鍚屾 鍦⊿P銆丟I涓绘媴褰撳彉鍖栨椂鏇存柊璇环鏉冮檺
*/
trigger AccountTrigger on Account (after insert, after update, before delete, before insert, before update, after delete ) {
- if (StaticParameter.EscapeAccountTrigger) {
-System.debug('Escape銆丒scapeAccountTrigger:::::' + StaticParameter.EscapeAccountTrigger);
- return;
- }
+
if ((Trigger.isAfter && Trigger.isInsert) || (Trigger.isAfter && Trigger.isUpdate) || (Trigger.isBefore && Trigger.isDelete)) {
// 鍚屾鍒� Account2__c
AccountTrigger.syncAccount2(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
@@ -21,6 +18,7 @@
if (Trigger.isBefore && (Trigger.isInsert || Trigger.isUpdate)) {
System.debug('=============> checkDepartment start');
AccountTrigger.checkDepartment(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
+ /**20221013 you LLIU-CK53S4
if(Trigger.isUpdate){
for(Account acc : Trigger.new){
if( acc.Is_Active__c == '鐒″姽' && acc.OwnerId == UserInfo.getUserId()){
@@ -30,6 +28,7 @@
}
}
+ **/
}
if (System.Test.isRunningTest()) {
if(Trigger.isInsert & Trigger.isAfter){
@@ -130,27 +129,32 @@
}
}
//HWAG-B4PCZ5 2018-09-19 end
+ if (StaticParameter.EscapeAccountTrigger) {
+ System.debug('Escape銆丒scapeAccountTrigger:::::' + StaticParameter.EscapeAccountTrigger);
+ return;
+ }
//NFM112 2021/11/10 start
- String Idbox;
+ List<String> IdList = new List<String>();
for(Account account : Trigger.new){
Account old = Trigger.oldMap.get(account.Id);
if(old.FirstParagraph__c != account.FirstParagraph__c || old.MonthlyPayment__c != account.MonthlyPayment__c){
- Idbox = account.Id;
+ IdList.add(account.Id);
}
}
- if(Idbox != null){
- BatchIF_Log__c iflog = new BatchIF_Log__c();
- iflog.Type__c = 'NFM112';
- iflog.Log__c = 'callout start\n';
- insert iflog;
- iflog = [Select Id, Name from BatchIF_Log__c where Id = :iflog.Id];
- System.debug(Logginglevel.DEBUG, 'NFM112_' + iflog.Name + ' start');
- NFM112Controller.executeNotFuture(iflog.Id, Idbox);
+ if(IdList.size()>0){
+ for(String Id : IdList){
+ BatchIF_Log__c iflog = new BatchIF_Log__c();
+ iflog.Type__c = 'NFM112';
+ iflog.Log__c = 'callout start\n';
+ insert iflog;
+ //iflog = [Select Id, Name from BatchIF_Log__c where Id = :iflog.Id];
+ //System.debug(Logginglevel.DEBUG, 'NFM112_' + iflog.Name + ' start');
+ NFM112Controller.executeNotFuture(iflog.Id, Id);
+ }
}
//NFM112 2021/11/10 end
}
-
- //add wangweipeng 2022/02/10 start
+ //add wangweipeng 2022/02/10 start
//缁忛攢鍟嗙殑鎬ц川鍙戠敓鍙樺寲锛岄偅涔堥渶瑕佸彂閭欢锛屽叾涓竴涓敹浠朵汉涓哄ぇ鍖哄姪鐞�
//澶у尯鍔╃悊锛氭牴鎹缁忛攢鍟嗘墍鍦ㄧ殑閭ｄ釜澶у尯锛屾潵鍒ゆ柇鍒板簳鍙戠粰璋侊紝姣忎釜澶у尯鍔╃悊閮芥湁涓�涓汉锛岀洰鍓嶆槸瀛樺埌鑷畾涔夋簮鏁版嵁閲岄潰浜�
if(Trigger.isBefore){
--
Gitblit v1.9.1