有货品牌融合全球购 fix

@@ -253,7 +253,7 @@ public class TblLogicService {
      */
     private ProductIndexBO processBrand(ProductIndexBO productIndexBO, TblBrand tblBrand,Map<Integer, TblBrandRelation> tblBrandRelationMap) {
         //如果全球购和有货之间存在映射
-        if(tblBrandRelationMap.containsKey(tblBrand.getBrandId())){
+        if(tblBrandRelationMap!=null&&tblBrandRelationMap.containsKey(tblBrand.getBrandId())){
             TblBrandRelation tblBrandRelation = tblBrandRelationMap.get(tblBrand.getBrandId());
             productIndexBO.setBrandId(tblBrandRelation.getYohoBrandId());
             String brandAlif = tblBrandRelation.getYohoBrandNameEn().substring(0,1).toUpperCase();
@@ -324,6 +324,9 @@ public class TblLogicService {
      * 处理Sort
      */
     private ProductIndexBO processSort(ProductIndexBO productIndexBO, List<HashMap<Integer, Integer>> sortMapList, Map<Integer, TblSortRelation> tblYohoSortRelationMap, HashMap<Integer, ProductSort> sortMap, TblProduct tblProduct) {
+        if(tblYohoSortRelationMap==null){
+            return productIndexBO;
+        }
         HashMap<Integer, Integer> MiddleToMaxSortMap = sortMapList.get(0);
         HashMap<Integer, Integer> SmallToMiddleSortMap = sortMapList.get(1);
         // 处理小分类