From 2ff0f0a7ab276c3466d9e06e14222db802194efc Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期六, 20 一月 2024 13:24:29 +0800
Subject: [PATCH] bakcupwf0120

---
 force-app/main/default/objects/Rental_Apply__c/fields/Need_Buzhang_Sale_NewApp__c.field-meta.xml |   53 +++++++++++++++++++++++++++++------------------------
 1 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/Need_Buzhang_Sale_NewApp__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/Need_Buzhang_Sale_NewApp__c.field-meta.xml
index 899ef80..c826197 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/Need_Buzhang_Sale_NewApp__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/Need_Buzhang_Sale_NewApp__c.field-meta.xml
@@ -2,32 +2,37 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Need_Buzhang_Sale_NewApp__c</fullName>
     <description>OPD璁″垝鏃朵笂绾匡紝鐢ㄤ綔鎺ㄥ箍缁忕悊鍜岀粡鐞嗕竴鑷达紝鍙互鐩存帴涓�姝ュ鎵归�氳繃鐢�
-20220422 ljh 鍘绘帀 鍖荤枟鍗庡寳钀ヤ笟鏈儴 SFDC-CDPAYF</description>
+20220422 ljh 鍘绘帀 鍖荤枟鍗庡寳钀ヤ笟鏈儴 SFDC-CDPAYF
+20231221 sx 閲嶅瀹℃壒閰嶅涓虹┖鏃舵墠鐩存帴鎵瑰噯锛屽惁鍒欒璧癱l3瀹℃壒</description>
     <externalId>false</externalId>
-    <formula>!((NOT( ISBLANK( SalesManager__c ))
-&amp;&amp; (SalesManager_eq_Buchang__c = false
-|| NOT((ISPICKVAL(Owner:User.Dept__c, &apos;鑳介噺浜嬩笟鏈儴&apos;)
-|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟涓滃寳钀ヤ笟鏈儴&apos;)
-|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟鍗庝笢钀ヤ笟鏈儴&apos;)
-|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟鍗庡崡钀ヤ笟鏈儴&apos;)
-|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟澶囧搧绠＄悊涓績&apos;)
-|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟鏈嶅姟鏈儴&apos;)
-|| ISPICKVAL(Owner:User.Dept__c, &apos;娑堝寲路鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴&apos;)
+    <formula>!(
+	(NOT(ISBLANK( SalesManager__c ))
+	&amp;&amp; (SalesManager_eq_Buchang__c = false
+		|| NOT((ISPICKVAL(Owner:User.Dept__c, &apos;鑳介噺浜嬩笟鏈儴&apos;)
+		|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟涓滃寳钀ヤ笟鏈儴&apos;)
+		|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟鍗庝笢钀ヤ笟鏈儴&apos;)
+		|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟鍗庡崡钀ヤ笟鏈儴&apos;)
+		|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟澶囧搧绠＄悊涓績&apos;)
+		|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟鏈嶅姟鏈儴&apos;)
+		|| ISPICKVAL(Owner:User.Dept__c, &apos;娑堝寲路鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴&apos;)))
+		)
+	&amp;&amp; OPDPlan__r.SalesManager__c != SalesManager__c)
+) 
+&amp;&amp; 
+!(
+	NOT( ISBLANK( BuchangApprovalManagerSales__c ) )
+	&amp;&amp; (ISPICKVAL(Owner:User.Dept__c, &apos;鑳介噺浜嬩笟鏈儴&apos;)
+		|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟涓滃寳钀ヤ笟鏈儴&apos;)
+		|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟鍗庝笢钀ヤ笟鏈儴&apos;)
+		|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟鍗庡崡钀ヤ笟鏈儴&apos;)
+		|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟澶囧搧绠＄悊涓績&apos;)
+		|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟鏈嶅姟鏈儴&apos;)
+		|| ISPICKVAL(Owner:User.Dept__c, &apos;娑堝寲路鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴&apos;)
+		|| ISBLANK( SalesManager__c )
+		)
 )
-)
-) &amp;&amp; OPDPlan__r.SalesManager__c != SalesManager__c)) &amp;&amp; !(
-NOT( ISBLANK( BuchangApprovalManagerSales__c ) )
-&amp;&amp; (ISPICKVAL(Owner:User.Dept__c, &apos;鑳介噺浜嬩笟鏈儴&apos;)
-|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟涓滃寳钀ヤ笟鏈儴&apos;)
-|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟鍗庝笢钀ヤ笟鏈儴&apos;)
-|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟鍗庡崡钀ヤ笟鏈儴&apos;)
-|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟澶囧搧绠＄悊涓績&apos;)
-|| ISPICKVAL(Owner:User.Dept__c, &apos;鍖荤枟鏈嶅姟鏈儴&apos;)
-|| ISPICKVAL(Owner:User.Dept__c, &apos;娑堝寲路鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴&apos;)
-|| ISBLANK( SalesManager__c )
-)
-
-)&amp;&amp; !(Text(demo_purpose2__c) = &apos;鍏朵粬&apos;)</formula>
+&amp;&amp; !(Text(demo_purpose2__c) = &apos;鍏朵粬&apos;)
+&amp;&amp; ISBLANK(repeatFixtureTXT__c)</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>澶囧搧鍊熷嚭鐢宠-瑕丆L5 鎬荤洃绾э紙閿�鍞級鐩存帴鎵瑰噯</label>
     <trackHistory>false</trackHistory>

--
Gitblit v1.9.1