Merge remote-tracking branch 'origin/dev' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -84,7 +84,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
         if (userDTO == null) {
             return ObjectRestResponse.succ(new PageDataVO<>());
         }
-        if(dto.getType() != 3) {
+        if(dto.getType() != null && dto.getType() != 3) {
             List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
             List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
             dto.setCompanyIds(companyIds);