From 1b3fb93f787b8b546a307bf063183f5295d183f8 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 16:53:25 +0800
Subject: [PATCH] merge

---
 force-app/main/default/objects/Report__c/validationRules/Product2CanNotEqualProduct1.validationRule-meta.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Report__c/validationRules/Product2CanNotEqualProduct1.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/Product2CanNotEqualProduct1.validationRule-meta.xml
index 31f395b..686d9fb 100644
--- a/force-app/main/default/objects/Report__c/validationRules/Product2CanNotEqualProduct1.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/Product2CanNotEqualProduct1.validationRule-meta.xml
@@ -4,7 +4,8 @@
     <active>true</active>
     <errorConditionFormula>(TEXT(OPD_ProductCategory2__c) = TEXT(OPD_ProductCategory1__c)) &amp;&amp;
 NOT(ISBLANK(TEXT(OPD_ProductCategory1__c))) &amp;&amp; 
-(RecordTypeId = &apos;01210000000Qekj&apos; || RecordTypeId = &apos;01210000000RLTi&apos;)</errorConditionFormula>
+(RecordTypeId = &apos;01210000000Qekj&apos; || RecordTypeId = &apos;01210000000RLTi&apos;)
+&amp;&amp;  $User.Username != &apos;buli@deloitte.com.cn.stagefull&apos;</errorConditionFormula>
     <errorDisplayField>OPD_ProductCategory2__c</errorDisplayField>
     <errorMessage>OPD浜у搧鍒嗙被2涓嶈兘绛変簬OPD浜у搧鍒嗙被1</errorMessage>
 </ValidationRule>

--
Gitblit v1.9.1