Skip to content

C
cloud-platform
Commit cf3ded19 authored by unset's avatar unset
Browse files
Options

Merge branch 'master-vehicle-price' into dev-tiande

parents 56db3ee2 b0df4bd4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleCommonPriceInfoBiz.java
View file @ cf3ded19
...@@ -59,7 +59,7 @@ public class VehicleCommonPriceInfoBiz extends BaseBiz<VehicleCommonPriceInfoMap ...@@ -59,7 +59,7 @@ public class VehicleCommonPriceInfoBiz extends BaseBiz<VehicleCommonPriceInfoMap
} }
if (vehicleList == null || vehicleList.size() <= 0) { //单个车辆可用 if (vehicleList == null || vehicleList.size() <= 0) { //单个车辆可用
VehicleCommonPriceInfo oldValue = getByVehicleId(vehicleCommonPriceInfo.getVehicleId()); VehicleCommonPriceInfo oldValue = getByVehicleId(vehicleCommonPriceInfo.getVehicleId());
if (oldValue == null) { if (oldValue == null && vehicleCommonPriceInfo.getId() == null) {
insertSelectiveRe(vehicleCommonPriceInfo); insertSelectiveRe(vehicleCommonPriceInfo);
} else { } else {
BeanUtil.copyProperties(vehicleCommonPriceInfo, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true)); BeanUtil.copyProperties(vehicleCommonPriceInfo, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
...@@ -71,7 +71,7 @@ public class VehicleCommonPriceInfoBiz extends BaseBiz<VehicleCommonPriceInfoMap ...@@ -71,7 +71,7 @@ public class VehicleCommonPriceInfoBiz extends BaseBiz<VehicleCommonPriceInfoMap
vehicleCommonPriceInfo.setVehicleId(vehicleInfo.getId()); vehicleCommonPriceInfo.setVehicleId(vehicleInfo.getId());
vehicleCommonPriceInfo.setCompanyId(vehicleInfo.getSubordinateBranch()); vehicleCommonPriceInfo.setCompanyId(vehicleInfo.getSubordinateBranch());
vehicleCommonPriceInfo.setModelId(vehicleInfo.getModelId()); vehicleCommonPriceInfo.setModelId(vehicleInfo.getModelId());
if (oldValue == null) { if (oldValue == null && vehicleCommonPriceInfo.getId() == null) {
insertSelectiveRe(vehicleCommonPriceInfo); insertSelectiveRe(vehicleCommonPriceInfo);
} else { } else {
BeanUtil.copyProperties(vehicleCommonPriceInfo, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true)); BeanUtil.copyProperties(vehicleCommonPriceInfo, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment