From 85b18058da15575cbf98fc0227d231eb205bc30d Mon Sep 17 00:00:00 2001
From: sunxia <sunxia@prec-tech.com>
Date: 星期一, 18 四月 2022 17:04:57 +0800
Subject: [PATCH] WLIG-CDHFT8  【委托】一次性耗材产品QIS邮件提醒问题反馈

---
 force-app/main/default/triggers/QISTrigger.trigger |   25 ++++++++++++++-----------
 force-app/main/default/classes/QISTriggerTest.cls  |    1 +
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/force-app/main/default/classes/QISTriggerTest.cls b/force-app/main/default/classes/QISTriggerTest.cls
index 1dbbfd7..ec6a3fc 100644
--- a/force-app/main/default/classes/QISTriggerTest.cls
+++ b/force-app/main/default/classes/QISTriggerTest.cls
@@ -168,6 +168,7 @@
     }
     //wangweipeng        LJPH-C7ZBSE          2021/10/27              start
     static testMethod void triggerTest2(){
+        Oly_TriggerHandler.bypass('ContactTriggerHandler');
         // 鐪�
         Address_Level__c al = new Address_Level__c();
         al.Name = '鏉变含';
diff --git a/force-app/main/default/triggers/QISTrigger.trigger b/force-app/main/default/triggers/QISTrigger.trigger
index 3e11450..43c5389 100644
--- a/force-app/main/default/triggers/QISTrigger.trigger
+++ b/force-app/main/default/triggers/QISTrigger.trigger
@@ -1,4 +1,7 @@
 trigger QISTrigger on QIS_Report__c ( before insert,after insert, after update, before update, after delete) {
+    if((!Test.isRunningTest())&&UserInfo.getUserId()==System.Label.ByPassTrigger){
+        return;
+    }
 System.debug( '-----:QIS璧峰嫊');
 
     // QIS銇敾鍍忋倰瑷畾銇欍倠
@@ -282,17 +285,17 @@
             if(String.isNotBlank(qrc.nonyushohin__c)){
                 if(qrc.ET_QIS_SEND_EMAIL__c){
                     if(String.isBlank(qrc.ET_QIS_SEND_EMAIL1__c)){
-                        
-                        qrc.ET_QIS_SEND_EMAIL1__c = 'Shuirong_Chen@olympus.com.cn.stagefull';
-                        qrc.ET_QIS_SEND_EMAIL2__c = 'Junbiao_Li@olympus.com.cn.stagefull';
-                        qrc.ET_QIS_SEND_EMAIL3__c = 'Weihan_Chen@olympus.com.cn.stagefull';
-                        qrc.ET_QIS_SEND_EMAIL4__c = 'Zhiming_Gao@olympus.com.cn.stagefull';
-
-
-                        /*qrc.ET_QIS_SEND_EMAIL1__c = 'Shuirong_Chen@olympus.com.cn';
-                        qrc.ET_QIS_SEND_EMAIL2__c = 'Junbiao_Li@olympus.com.cn';
-                        qrc.ET_QIS_SEND_EMAIL3__c = 'Weihan_Chen@olympus.com.cn';
-                        qrc.ET_QIS_SEND_EMAIL4__c = 'Zhiming_Gao@olympus.com.cn';*/
+                        if (NFMUtil.isSandbox()) {  //娴嬭瘯鐜
+                            qrc.ET_QIS_SEND_EMAIL1__c = 'Shuirong_Chen@olympus.com.cn.stagefull';
+                            qrc.ET_QIS_SEND_EMAIL2__c = 'Junbiao_Li@olympus.com.cn.stagefull';
+                            qrc.ET_QIS_SEND_EMAIL3__c = 'Weihan_Chen@olympus.com.cn.stagefull';
+                            qrc.ET_QIS_SEND_EMAIL4__c = 'Zhiming_Gao@olympus.com.cn.stagefull';
+                        } else {  //姝e紡鐜
+                            qrc.ET_QIS_SEND_EMAIL1__c = 'Shuirong_Chen@olympus.com.cn';
+                            qrc.ET_QIS_SEND_EMAIL2__c = 'Junbiao_Li@olympus.com.cn';
+                            qrc.ET_QIS_SEND_EMAIL3__c = 'Weihan_Chen@olympus.com.cn';
+                            qrc.ET_QIS_SEND_EMAIL4__c = 'Zhiming_Gao@olympus.com.cn';
+                        }
                     }
                 }else{
                     if(String.isNotBlank(qrc.ET_QIS_SEND_EMAIL1__c)){

--
Gitblit v1.9.1