高章伟
2023-03-02 e3c02c03dd2de442bbced87236f60a13a1cd154e
force-app/main/default/triggers/RentalApplyTrigger.trigger
@@ -1,4 +1,5 @@
trigger RentalApplyTrigger on Rental_Apply__c (before insert, before update,after insert,after update,after delete) {
    if(Test.isRunningTest()||UserInfo.getUserId()!=System.Label.ByPassTrigger){
    RentalApplyTriggerHandler handler = new RentalApplyTriggerHandler();
    handler.run();
@@ -134,7 +135,9 @@
            Map<Id, User> personInChargeMap = new Map<Id, User>([
                SELECT Id, Name, OCM_man_province_Rental__c, Dept__c FROM User WHERE Id IN :personInChargeIds
            ]);
            List<OCM_Management_Province__c> mpList = [select id, Name, Admin_assistant__c, Admin_assistant2__c, Admin_assistant3__r.Name, Energy_assistant__c from OCM_Management_Province__c];
                // 20220517 ljh SWAG-CDTEFS update start
                // List<OCM_Management_Province__c> mpList = [select id, Name, Admin_assistant__c, Admin_assistant2__c, Admin_assistant3__r.Name, Energy_assistant__c from OCM_Management_Province__c];
                List<OCM_Management_Province__c> mpList = [select id, Name, Admin_assistant__c, Admin_assistant2__c, Admin_assistant3__r.Name, Energy_assistant__c,OBA3_Email_Group__c from OCM_Management_Province__c];
            Map<String, OCM_Management_Province__c> mpMap = new Map<String, OCM_Management_Province__c>();
            for (OCM_Management_Province__c mp : mpList) {
                mpMap.put(mp.Name, mp);
@@ -155,7 +158,7 @@
                            rac.Rental_Assistant__c = omp.Admin_assistant__c;
                            rac.Rental_Assistant2__c = omp.Admin_assistant2__c;
                            rac.Rental_Assistant3__c = omp.Admin_assistant3__r.Name;// SWAG-BZL695 you 20210331
                                rac.OBA3_Email_Group__c = omp.OBA3_Email_Group__c;// 20220517 ljh SWAG-CDTEFS add
                        //}
                        /*
                        SWAG-B6X8CK  把能量事业本部的判断去掉,都取备品助理 2018/11/29 end
@@ -479,3 +482,4 @@
        // }
    }
}
}