Merge branch 'master_chw_publish' into dev-chw

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

@@ -23,8 +23,7 @@ public class VehicleUseTimeBiz extends BaseBiz<VehicleUseTimeMapper, VehicleUseT
 
      public  void  addOrUpd(VehicleUseTime vehicleUseTime){
          String vehicleId = vehicleUseTime.getVehicleId();
-         Integer companyId = vehicleUseTime.getCompanyId() == null ? 0 :vehicleUseTime.getCompanyId();
-         if (StringUtils.isBlank(vehicleId) || companyId == 0){
+         if (StringUtils.isBlank(vehicleId) ){
              throw  new BaseException("参数不能为空", ResultCode.FAILED_CODE);
          }
          Example example = new Example(VehicleUseTime.class);
@@ -35,6 +34,10 @@ public class VehicleUseTimeBiz extends BaseBiz<VehicleUseTimeMapper, VehicleUseT
              vehicleUseTime.setId(vehicleUseTime1.getId());
              updateSelectiveById(vehicleUseTime);
          }else {
+             Integer companyId = vehicleUseTime.getCompanyId() == null ? 0 :vehicleUseTime.getCompanyId();
+             if ( companyId == 0){
+                 throw  new BaseException("参数不能为空", ResultCode.FAILED_CODE);
+             }
              insertSelective(vehicleUseTime);
          }
      }