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/OpportunityHpDeptUpd.trigger | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/force-app/main/default/triggers/OpportunityHpDeptUpd.trigger b/force-app/main/default/triggers/OpportunityHpDeptUpd.trigger
index d7a208c..2474961 100644
--- a/force-app/main/default/triggers/OpportunityHpDeptUpd.trigger
+++ b/force-app/main/default/triggers/OpportunityHpDeptUpd.trigger
@@ -14,30 +14,25 @@
Map<Integer, Opportunity> oppForLookUpMap = new Map<Integer, Opportunity>();
Integer idx = 0;
for(Opportunity opp : Trigger.new) {
- // 20221112 you DB202211366462
-
- if(opp.TenderBeginDate__c !=null && opp.TenderBeginDate__c != opp.TenderBeginDate_Text__c ){
- opp.TenderBeginDate_Text__c = opp.TenderBeginDate__c;
- }else if(opp.TenderBeginDate__c ==null){
- opp.TenderBeginDate_Text__c = opp.Bid_Date__c;
- }
// 鍙ゃ亜銉囥兗銈裤伄鏇存柊銈掔姝�
- if (Trigger.isUpdate) {
- Boolean noChange = false;
- for (String colApiName : ControllerUtil.oppColumnList) {
- colApiName = colApiName.trim();
- if (opp.oldData_flg__c &&
- Trigger.oldMap.get(opp.Id).get(colApiName) != Trigger.newMap.get(opp.Id).get(colApiName)) {
- noChange = true;
- break;
- }
- }
- if (noChange) {
- opp.addError('涓嶈兘淇敼鏃ф暟鎹�');
- continue;
- }
- }
+ //20221229 lt DB202211430986 璇环鍘嗗彶涓嶄娇鐢ㄥ瓧娈�
+ // if (Trigger.isUpdate) {
+ // Boolean noChange = false;
+ // for (String colApiName : ControllerUtil.oppColumnList) {
+ // colApiName = colApiName.trim();
+ // if (opp.oldData_flg__c &&
+ // Trigger.oldMap.get(opp.Id).get(colApiName) != Trigger.newMap.get(opp.Id).get(colApiName)) {
+ // noChange = true;
+ // break;
+ // }
+ // }
+ // if (noChange) {
+ // opp.addError('涓嶈兘淇敼鏃ф暟鎹�');
+ // continue;
+ // }
+ // }
+ //20221229 lt DB202211430986 璇环鍘嗗彶涓嶄娇鐢ㄥ瓧娈�
if ((Trigger.isUpdate
&& (Trigger.oldMap.get(opp.Id).get('AccountId') != opp.AccountId
--
Gitblit v1.9.1