修改区域公司

hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java

@@ -461,9 +461,14 @@ public class HighOrderController {
 
             if (request.getHeader("regionId") != null && request.getHeader("regionId").length() != 0) {
                 SecRegion region = commonService.getParentByRegion(Long.valueOf(request.getHeader("regionId")));
+                if (region != null) {
                     BsCompany bsCompany = bsCompanyService.selectCompanyByRegion(region.getRegionId().toString());
+                    if (bsCompany != null) {
                         highOrder.setCompanyId(bsCompany.getId());
                     }
+                }
+
+            }
 
             highOrder.setMerchId(request.getHeader("mchId"));
             highOrder.setWhetherRebate(false);