From e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 11:22:08 +0800
Subject: [PATCH] Merge branch 'master' into LightningUpgradeProject

---
 force-app/main/default/objects/Repair__c/validationRules/Send_NFM103_Chk1.validationRule-meta.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/objects/Repair__c/validationRules/Send_NFM103_Chk1.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Send_NFM103_Chk1.validationRule-meta.xml
index 12265cb..ac45f2e 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Send_NFM103_Chk1.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Send_NFM103_Chk1.validationRule-meta.xml
@@ -3,9 +3,13 @@
     <fullName>Send_NFM103_Chk1</fullName>
     <active>true</active>
     <description>鐢宠淇悊鏃讹紝蹇呴』濉啓鏁呴殰鍙戠敓鎯呭喌  鍘熸潵鐨勬彁绀�20200331</description>
-    <errorConditionFormula>TEXT(Status__c) = &quot;1.鍙楃悊瀹屾瘯&quot; 
+    <errorConditionFormula>OR(
+    Text(Status__c)=&apos;1.鍙楃悊瀹屾瘯&apos;,
+    Text(Status__c)=&apos;0.鐢宠瀹屾瘯&apos;
+)
 &amp;&amp; Repair_Detail__c = &quot;&quot; 
-&amp;&amp;RepairSource__c !=&apos;QIS杞慨鐞�&apos;</errorConditionFormula>
+&amp;&amp;RepairSource__c !=&apos;QIS杞慨鐞�&apos;
+&amp;&amp; $User.Batch_User__c ==false</errorConditionFormula>
     <errorDisplayField>Repair_Detail__c</errorDisplayField>
     <errorMessage>鐢宠淇悊鏃讹紝蹇呴』濉啓闂鍐呭鎻忚堪</errorMessage>
 </ValidationRule>

--
Gitblit v1.9.1