fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

 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 {  //正式环境
                            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)){