fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

 force-app/main/default/triggers/SolutionProjectRequirementsTrigger.trigger

@@ -185,29 +185,30 @@
                sol.Name = sol.OCM_period_New__c + '-' + sol.ProvinceAbbreviation__c + '-' + sol.Area_Number__c;
            //20201225 you WLIG-BV8CHF end
            }
            //20220615 you XLIU-CFDB4C start
            // 营业项目窗口赋值
            if(sol.Salesdepartment_HP__c == '1.华北'){
                sol.Sales_Assistant__c ='00510000001OOLj';
                sol.Sales_Assistant__c =System.Label.Solution_HB;//'00510000001OOLj';
                // urlStr += '&CF00Np00000045HcO=' + encodeURI("肖 娜");
            }else if(sol.Salesdepartment_HP__c == '2.东北'){
                sol.Sales_Assistant__c ='00510000001OOSZ';
                sol.Sales_Assistant__c =System.Label.Solution_DB;//'00510000001OOSZ';
                // urlStr += '&CF00Np00000045HcO=' + encodeURI("金 丽华");
            }else if(sol.Salesdepartment_HP__c == '3.西北'){
                sol.Sales_Assistant__c ='00510000007kteE';
                sol.Sales_Assistant__c =System.Label.Solution_XB;//'00510000007kteE';
                // urlStr += '&CF00Np00000045HcO=' + encodeURI("王 喆");
            }else if(sol.Salesdepartment_HP__c == '4.西南'){
                sol.Sales_Assistant__c ='00510000001OORm';
                sol.Sales_Assistant__c =System.Label.Solution_XN;//'00510000001OORm';
                // urlStr += '&CF00Np00000045HcO=' + encodeURI("李 娟");
            }else if(sol.Salesdepartment_HP__c == '5.华东'){
                sol.Sales_Assistant__c ='00510000000gW9G';
                sol.Sales_Assistant__c =System.Label.Solution_HD;//'00510000000gW9G';
                // urlStr += '&CF00Np00000045HcO=' + encodeURI("杨 剑清");
            }else if(sol.Salesdepartment_HP__c == '6.华南'){
                sol.Sales_Assistant__c ='00510000001OOJy';
                sol.Sales_Assistant__c =System.Label.Solution_HN;//'00510000001OOJy'; 改成位静
                // urlStr += '&CF00Np00000045HcO=' + encodeURI("王 志锋");
            }else{
                // 
            }

            //20220615 you XLIU-CFDB4C end
        }
        // 更新大区最新编号
        // girAreaList[0].GIRSolutionHB__c = areaHB;