From ead4df22dca33a867279471821ca675f91dec760 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期六, 14 五月 2022 18:44:54 +0800
Subject: [PATCH] FixIssue0514
---
force-app/main/default/classes/OrderTriggerHandler.cls | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/classes/OrderTriggerHandler.cls b/force-app/main/default/classes/OrderTriggerHandler.cls
index f915de4..8f35120 100644
--- a/force-app/main/default/classes/OrderTriggerHandler.cls
+++ b/force-app/main/default/classes/OrderTriggerHandler.cls
@@ -2090,15 +2090,14 @@
newOrder.BS_AsistBGenManger_BS__c = u.BS_AsistBGenManger__c == null ? u.Id : u.BS_AsistBGenManger__c;
newOrder.BS_AsistGenManger_BS__c = u.BS_AsistGenManger__c == null ? u.Id : u.BS_AsistGenManger__c;
- newOrder.BS_MandAGM__c = u.BS_Manager__c == u.BS_AsistGenManger__c ? true : false;
- newOrder.BS_AGMandD__c = u.BS_AsistGenManger__c == u.BS_Department__c ? true : false;
- newOrder.BS_DandAB__c = u.BS_Department__c == u.BS_AsistBGenManger__c ? true : false;
+ newOrder.BS_MandAGM__c = u.BS_Manager__c == u.BS_AsistBGenManger__c ? true : false;
+ //newOrder.BS_AGMandD__c = u.BS_AsistGenManger__c == u.BS_Department__c ? true : false;
+ //newOrder.BS_DandAB__c = u.BS_Department__c == u.BS_AsistBGenManger__c ? true : false;
newOrder.BS_ABGandBD__c = u.BS_AsistBGenManger__c == u.BS_BDepartment__c ? true : false;
newOrder.BS_BDandIND__c = u.BS_BDepartment__c == u.BS_INDepartment__c ? true : false;
newOrder.BS_INDandGM__c = u.BS_INDepartment__c == u.BS_GeneralManager__c ? true : false;
}
}
-
if (newOrder.ProductSegment__c != 'BS') {
newOrder.SalesOwner_BS__c = newOrder.OpportunityOwnerId__c;
@@ -2119,6 +2118,14 @@
}
//}
}
+
+ for (Order newOrder : newList) {
+ if (newOrder.ProductSegment__c == 'BS') {
+ newOrder.BS_AGMandD__c = newOrder.BS_Manager_BS__c == newOrder.SalesOwner_BS__c ? true : false;
+ newOrder.BS_DandAB__c = newOrder.BS_Department_BS__c == newOrder.SalesOwner_BS__c ? true : false;
+ }
+ }
+
}
@@ -2851,6 +2858,8 @@
for(OpportunityContactRole oppor:role_list){
roleMap.put(oppor.OpportunityId,oppor.ContactId);
}
+ System.debug('oppidList: ' + oppidList);//Nancy 2022-04-25
+ System.debug('role_list: ' + role_list);//Nancy 2022-04-25
// 鑾峰彇绯荤粺绠＄悊鍛業d
String getUserId = System.label.SystemAdmin1_2_GPI;
String errMessage = '瀹㈡埛鍚嶆垨鏈�缁堢敤鎴蜂笌璇环涓嶄竴鑷达紒';
--
Gitblit v1.9.1