OBPM 上线比较文件差异注释解开

sunxia

2022-03-11 9909cdba659d1933abb3c63e9cc5dc7e719f90e6

 force-app/main/default/classes/RentalFixtureSetAssignController.cls

@@ -296,10 +296,10 @@
            Rental_Apply__c raUpd = [
                    SELECT Id, Shipment_request_Cnt__c,
                           Asset_loaner_start_day__c,
                           // Campaign__c,
                           // Campaign__r.IF_Approved__c,
                           // Campaign__r.Meeting_Approved_No__c,
                           Asset_loaner_closed_day__c
                           Asset_loaner_closed_day__c,
                           Campaign__c,
                           Campaign__r.IF_Approved__c,
                           Campaign__r.Meeting_Approved_No__c
                      FROM Rental_Apply__c
                     WHERE Id = :parentId
                       FOR Update];
@@ -315,9 +315,9 @@
            }

            //20220228 sx obpm修改 是否申请决裁勾着没有决裁编号不能进行操作
            // if( raUpd.Campaign__c!= null && raUpd.Campaign__r.IF_Approved__c && raUpd.Campaign__r.Meeting_Approved_No__c == null){
            //     throw new ControllerUtil.myException('已申请决裁但决裁编码为空');
            // }
            if( raUpd.Campaign__c!= null && raUpd.Campaign__r.IF_Approved__c && raUpd.Campaign__r.Meeting_Approved_No__c == null){
                throw new ControllerUtil.myException('已申请决裁但决裁编码为空');
            }

            Integer indexNum = 1;
            // 20210708 ljh SFDC-C47CLV add start