修改预定记录时间限制显示问题

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

@@ -128,9 +128,15 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         CompanyDetail detail = null;
         if (branchCompany != null) {
             List<SysRegion> sysRegions = sysRegionBiz.getRegionsByCodes(new ArrayList<Long>() {{
-                add(Long.valueOf(branchCompany.getAddrProvince()));
-                add(Long.valueOf(branchCompany.getAddrCity()));
-                add(Long.valueOf(branchCompany.getAddrTown()));
+                if(branchCompany.getAddrProvince() != null) {
+                    add(Long.valueOf(branchCompany.getAddrProvince()));
+                }
+                if(branchCompany.getAddrCity() != null) {
+                    add(Long.valueOf(branchCompany.getAddrCity()));
+                }
+                if(branchCompany.getAddrTown() != null) {
+                    add(Long.valueOf(branchCompany.getAddrTown()));
+                }
             }});
             detail = BeanUtil.toBean(branchCompany, CompanyDetail.class);
             detail.setSysRegions(sysRegions);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java

@@ -116,7 +116,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         //查询车型信息，车型类型关系
         //公司信息，系统信息（购车须知，预定须知）
         ObjectRestResponse<List<VehicleModel>> vms = entityList(vehicleModel);
-        if (null == vms.getData() || null == vms.getData().get(0))
+        if (null == vms.getData() || vms.getData().size() <= 0)
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         VehicleModel vm = vms.getData().get(0);
         VModelDetailVO vModelDetailVO = initVModelDetailVO(vm);