From 873e4a41dd4d86e9038f32d924075247be7cd449 Mon Sep 17 00:00:00 2001
From: 游畅 <youchang@prec-tech.com>
Date: 星期四, 31 三月 2022 17:59:36 +0800
Subject: [PATCH] 新建事件报错20220331
---
force-app/main/default/classes/SimpleEventRegisterController.cls | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/classes/SimpleEventRegisterController.cls b/force-app/main/default/classes/SimpleEventRegisterController.cls
index dff5a34..4c547c7 100644
--- a/force-app/main/default/classes/SimpleEventRegisterController.cls
+++ b/force-app/main/default/classes/SimpleEventRegisterController.cls
@@ -1038,9 +1038,11 @@
}
}
+
//20201123 zh 鍒涘缓涓诲姩浠诲姟涓庣淮淇悎鍚屽叧鑱� end
if (LoginUser.Job_Category__c.equals('閿�鍞帹骞�')) {
if (this.targetEvent.Activity_Type2__c == '鐥呴櫌') {
+
// 2021-06-11 mzy sla 娉ㄩ噴鎺変簡璇环3 鍥犱负鐜板湪鐨勯〉闈㈡病鏈夌粰璇环3璧嬪��,鎵�浠ヤ細鏄剧ず 璇环3涓嶇瓑浜庣┖瀛楃涓茶�屾槸绛変簬null ,瀵艰嚧鍚庨潰鐨勫垽鏂繘涓嶅幓
// if (this.targetEvent.Related_Opportunity1__c != '' || this.targetEvent.Related_Opportunity2__c != '' || this.targetEvent.Related_Opportunity3__c != '') {
System.debug('娴嬭瘯璇环浠诲姟:' +'璇环1:' +this.targetEvent.Related_Opportunity1__c +'---璇环2:'+this.targetEvent.Related_Opportunity2__c);
@@ -1048,10 +1050,10 @@
taskType = System.Label.OpportunityFollow; // 璇环璺熻繘浠诲姟
} else if (this.targetEvent.OPDPlan_Flag__c) {
taskType = System.Label.OPD; // OPD浠诲姟
- } else if (accToNumTarget.get(accToDepMap.get(this.targetEvent.whatid__c)).Is_Target_Account_Energy__c == 1 || accToNumTarget.get(accToDepMap.get(this.targetEvent.whatid__c)).Is_Target_Account__c == 1) {
- taskType = System.Label.TargetAccountVisit; // 鐩爣瀹㈡埛鎷滆浠诲姟
- } else if (accToNumTarget.get(accToDepMap.get(this.targetEvent.whatid__c)).OCM_Category__c == 'H1' || accToNumTarget.get(accToDepMap.get(this.targetEvent.whatid__c)).OCM_Category__c == 'H0') {
- taskType = System.Label.visitHLevel; // H灞傛嫓璁夸换鍔�
+ } else if (!accToNumTarget.isEmpty() && !accToDepMap.isEmpty() && (accToNumTarget.get(accToDepMap.get(this.targetEvent.whatid__c)).Is_Target_Account_Energy__c == 1 || accToNumTarget.get(accToDepMap.get(this.targetEvent.whatid__c)).Is_Target_Account__c == 1)) {
+ taskType = System.Label.TargetAccountVisit; // 鐩爣瀹㈡埛鎷滆浠诲姟
+ } else if (!accToNumTarget.isEmpty() && !accToDepMap.isEmpty() && (accToNumTarget.get(accToDepMap.get(this.targetEvent.whatid__c)).OCM_Category__c == 'H1' || accToNumTarget.get(accToDepMap.get(this.targetEvent.whatid__c)).OCM_Category__c == 'H0')) {
+ taskType = System.Label.visitHLevel; // H灞傛嫓璁夸换鍔�
} else {
taskType = System.Label.DailyVisit;// 鏃ョ▼鎷滆浠诲姟
}
@@ -1176,7 +1178,7 @@
taskAccType = '鐢ㄦ埛鎷滆';
}
if (this.targetEvent.Activity_Type2__c == '璨╁２搴�') {
- taskAccType = '缁忛攢鍟嗘敮鎸�';
+ taskAccType = '缁忛攢鍟嗘嫓璁�';
}
if (this.targetEvent.Activity_Type2__c == '绀惧銈ゃ儥銉炽儓') {
taskAccType = '瀛︽湳浼氳';
@@ -1209,7 +1211,7 @@
taskAccType = '鐢ㄦ埛鎷滆';
}
if (this.targetEvent.Activity_Type2__c == '璨╁２搴�') {
- taskAccType = '缁忛攢鍟嗘敮鎸�';
+ taskAccType = '缁忛攢鍟嗘嫓璁�';
}
if (this.targetEvent.Activity_Type2__c == '绀惧銈ゃ儥銉炽儓') {
taskAccType = '瀛︽湳浼氳';
--
Gitblit v1.9.1