From 22b55a2ccc10820dcb0338f560f78bde7b43a95d Mon Sep 17 00:00:00 2001
From: 游畅 <youchang@prec-tech.com>
Date: 星期日, 24 四月 2022 17:02:23 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBGProduct
---
force-app/main/default/classes/SimpleEventRegisterController.cls | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/SimpleEventRegisterController.cls b/force-app/main/default/classes/SimpleEventRegisterController.cls
index 4c547c7..1f0225b 100644
--- a/force-app/main/default/classes/SimpleEventRegisterController.cls
+++ b/force-app/main/default/classes/SimpleEventRegisterController.cls
@@ -948,7 +948,9 @@
delayTask.GeneratePlan__c = true; //2021-10-20 mzy 浠诲姟绠＄悊鏀瑰杽 start
delayTask.ConfirmDate__c = Date.today(); //鎺ュ彈鏃堕棿
delayTask.Activity_Date__c = targetEvent.StartDateTime.date(); //鎷滆鏃ユ湡 20201105 zh CHAN-BUV2TF
- delayTask.account__c = this.targetEvent.whatid__c; //瀹㈡埛
+ if(null != this.targetEvent.whatid__c && !''.equals(this.targetEvent.whatid__c)){//2022-4-24 yjk 澧炲姞闈炵┖楠岃瘉
+ delayTask.account__c = this.targetEvent.whatid__c; //瀹㈡埛
+ }
System.debug(this.targetEvent.whatid__c + '======');
// delayTask.Name = UserInfo.getName()+' 娴嬭瘯浠诲姟 '+delayTask.taskStatus__c;
delayTask.Name = task.Name;
@@ -1836,7 +1838,7 @@
//2021-11-02 mzy 浠诲姟绠＄悊鏀瑰杽寮�鍙戣鍒� end
//5.鐢宠绫诲瀷
tempCancelPostponePlan.ApplyType__c = '寤舵湡';
-
+ tempCancelPostponePlan.isDailyReportDelay__c = true;//2022-4-22 yjk 浜嬩欢寤舵湡odp澧炲姞鏍囪瘑锛岄槻姝㈠惊鐜�
insert tempCancelPostponePlan;
}
--
Gitblit v1.9.1