From 928399eceec50e3d37ea08669a12789a9410a9d2 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 22 十一月 2022 16:51:16 +0800
Subject: [PATCH] 111

---
 force-app/main/default/objects/Rental_Apply__c/fields/OPDBuchang__c.field-meta.xml |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/OPDBuchang__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/OPDBuchang__c.field-meta.xml
index a35b4d3..53396ff 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/OPDBuchang__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/OPDBuchang__c.field-meta.xml
@@ -12,9 +12,17 @@
 ))
 ,&apos;&apos;
 ,IF(AND(!ISBLANK(Old_Rental_Apply__c),ISBLANK(OriginalOpdPlanApplication__c))
-,OPDManagerText__c
-,if( BuchangApprovalManagerSalesSubmit__c == OPDPlan__r.BuchangApprovalManagerSales_Txt__c||( ISBLANK(Old_Rental_Apply__c) &amp;&amp; BuchangApprovalManagerSales__c == OPDPlan__r.BuchangApprovalManagerSales__c) ,OPDPlan__r.BuchangApprovalManagerSales_Txt__c,&apos;&apos;)
-))</formula>
+	,OPDBuchang_Text__c
+	,IF(!ISBLANK(OPDBuchangApprover__c)
+		,OPDBuchangApprover__c
+		,
+		IF(OR( AND(!ISBLANK(Request_demo_day__c), Request_demo_day__c &gt; DATE(2022,09,29)),DATEVALUE(CreatedDate) &gt; DATE(2022,09,29)) 
+			,OPDBuchangApprover__c
+			,if( BuchangApprovalManagerSalesSubmit__c == OPDPlan__r.BuchangApprovalManagerSales_Txt__c||( ISBLANK(Old_Rental_Apply__c) &amp;&amp; BuchangApprovalManagerSales__c == OPDPlan__r.BuchangApprovalManagerSales__c) ,OPDPlan__r.BuchangApprovalManagerSales_Txt__c,&apos;&apos;)
+		)
+	)
+)
+)</formula>
     <label>OPD璁″垝瀹℃壒CL5 鎬荤洃绾�</label>
     <required>false</required>
     <trackHistory>false</trackHistory>

--
Gitblit v1.9.1