From 6a471bc62a8567abd74dcef733fcddf9911b6a16 Mon Sep 17 00:00:00 2001
From: denny chen <chenbangcai@prec-tech.com>
Date: 星期三, 29 三月 2023 15:47:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG

---
 force-app/main/default/objects/Rental_Apply__c/validationRules/Purpose2_RepairUser_Have_Contract.validationRule-meta.xml |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/Purpose2_RepairUser_Have_Contract.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/Purpose2_RepairUser_Have_Contract.validationRule-meta.xml
index 74a0e9f..c62c5a8 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/Purpose2_RepairUser_Have_Contract.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/Purpose2_RepairUser_Have_Contract.validationRule-meta.xml
@@ -2,10 +2,12 @@
 <ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Purpose2_RepairUser_Have_Contract</fullName>
     <active>true</active>
-    <errorConditionFormula>RecordTypeId  &lt;&gt; &quot;01210000000RHIn&quot;  &amp;&amp; 
-(TEXT(demo_purpose2__c) &lt;&gt; &apos;淇濅慨鐢ㄦ埛&apos;) &amp;&amp; 
-Repair__c != null &amp;&amp; 
-(Repair__r.Number_of_EffectiveContract__c == &apos;鏈�&apos;) &amp;&amp; ($User.ProfileId &lt;&gt;&apos;00e10000000Y3o5&apos;)</errorConditionFormula>
+    <description>update lxy 2022/11/15 鏍规嵁DB202211216861 淇敼锛氭柊鍚堝悓澶囧搧纭繚鎻愪緵=true 鎴栬�� 锛堟湁缁翠慨鍚堝悓 骞朵笖 鏃犲伩鍖哄埆鏍囧織涓嶇瓑浜�8: 甯傚満澶氬勾淇濅慨锛夛紝蹇呴』閫夋嫨淇濅慨鐢ㄦ埛</description>
+    <errorConditionFormula>RecordTypeId  &lt;&gt; &quot;01210000000RHIn&quot;   
+&amp;&amp;(TEXT(demo_purpose2__c) &lt;&gt; &apos;淇濅慨鐢ㄦ埛&apos;)  
+&amp;&amp; Repair__c != null 
+&amp;&amp; (EquipmentGuaranteeFlg__c==true || (Repair__r.Number_of_EffectiveContract__c == &apos;鏈�&apos; &amp;&amp; Repair__r.NewProductGuaranteeObject__c &lt;&gt; &apos;8: 甯傚満澶氬勾淇濅慨&apos;) )
+&amp;&amp; ($User.ProfileId &lt;&gt;&apos;00e10000000Y3o5&apos;)</errorConditionFormula>
     <errorDisplayField>demo_purpose2__c</errorDisplayField>
     <errorMessage>鏈夌淮淇悎鍚�,蹇呴』閫夋嫨淇濅慨鐢ㄦ埛.</errorMessage>
 </ValidationRule>

--
Gitblit v1.9.1