force-app/main/default/classes/RepairTrigger.cls
@@ -406,12 +406,14 @@
                            }
                        }
                    }else if(repair.On_site_repair__c == '办事处修理' || repair.On_site_repair__c== '现场修理'){
                        if(repair.Sales_Branch__c == '上海分公司'){
                      /** 20230313 you DB202303171085
                       if(repair.Sales_Branch__c == '上海分公司'){
                            if (hzProvince.contains(repair.SalesOfficeCode_selection__c)) {
                                repair.work_location_select__c = '杭州共通办事处';
                                leakDefaultFlag = false;
                            }
                        } else if(repair.Sales_Branch__c == '广州分公司'){
                        } else **/
                        if(repair.Sales_Branch__c == '广州分公司'){
                            if (cdProvince.contains(repair.SalesOfficeCode_selection__c)) {
                                repair.work_location_select__c = '成都共通办事处';
                                leakDefaultFlag = false;
@@ -477,12 +479,14 @@
                                leakDefaultFlag = false;
                            }
                        }else if(repair.On_site_repair__c == '办事处修理' || repair.On_site_repair__c== '现场修理'){
                           /** 20230313 you DB202303171085
                            if(repair.Contract_Principal_Office__c == '上海RC'){
                                if (hzProvince.contains(repair.SalesOfficeCode_selection__c)) {
                                    repair.work_location_select__c = '杭州共通办事处';
                                    leakDefaultFlag = false;
                                }
                            } else if(repair.Contract_Principal_Office__c == '广州RC'){
                            } else **/
                            if(repair.Contract_Principal_Office__c == '广州RC'){
                                if (cdProvince.contains(repair.SalesOfficeCode_selection__c)) {
                                    repair.work_location_select__c = '成都共通办事处';
                                    leakDefaultFlag = false;
@@ -591,13 +595,15 @@
                            }
                        }
                     }else if(repair.On_site_repair__c == '办事处修理' || repair.On_site_repair__c== '现场修理'){
                        /** 20230313 you DB202303171085
                        if(repair.Sales_Branch__c == '上海分公司'){
                            //根据修理品返送地为非北京
                            if (hzProvince.contains(repair.SalesOfficeCode_selection__c)) {
                                repair.work_location_select__c = '杭州共通办事处';
                                leakDefaultFlag = false;
                            }
                        } else if(repair.Sales_Branch__c == '广州分公司'){
                        } else **/
                        if(repair.Sales_Branch__c == '广州分公司'){
                            //根据修理品返送地为非北京
                            if (cdProvince.contains(repair.SalesOfficeCode_selection__c)) {
                                repair.work_location_select__c = '成都共通办事处';
@@ -667,12 +673,14 @@
                                leakDefaultFlag = false;
                            }
                        }else if(repair.On_site_repair__c == '办事处修理' || repair.On_site_repair__c== '现场修理'){
                           /** 20230313 you DB202303171085
                            if(middleTable.Maintenance_Contract__r.SalesOfficeCode_selection__c == '上海RC'){
                                if (hzProvince.contains(repair.SalesOfficeCode_selection__c)) {
                                    repair.work_location_select__c = '杭州共通办事处';
                                    leakDefaultFlag = false;
                                }
                            } else if(middleTable.Maintenance_Contract__r.SalesOfficeCode_selection__c == '广州RC'){
                            } else**/
                            if(middleTable.Maintenance_Contract__r.SalesOfficeCode_selection__c == '广州RC'){
                                if (cdProvince.contains(repair.SalesOfficeCode_selection__c)) {
                                    repair.work_location_select__c = '成都共通办事处';
                                    leakDefaultFlag = false;