Merge branch 'master-vehicle-bg' into base-modify

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

@@ -26,11 +26,13 @@ public class BranchCompanyVehicleCountBiz extends BaseBiz<BranchCompanyVehicleCo
 		Iterator<BranchCompanyVehicleCount> iterator = branchCompanyVehicleCounts.iterator();
 		while (iterator.hasNext()) {
 			BranchCompanyVehicleCount newValue = iterator.next();
+			if(newValue != null) {
 				BranchCompanyVehicleCount oldValue = selectOne(newValue);
 				if (oldValue != null) {
 					iterator.remove();
 				}
 			}
+		}
 		insertMultiSelective(branchCompanyVehicleCounts);
 		return ObjectRestResponse.succ();
 	}