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

0b2c7830 · jiaorz · dff317bc · f136bfb7 · 0b2c7830
Commit 0b2c7830 authored Nov 19, 2019 by jiaorz
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

BranchCompanyVehicleCountBiz.java ...fc/platform/vehicle/biz/BranchCompanyVehicleCountBiz.java +5 -3

No files found.
--- a/xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyVehicleCountBiz.java
+++ b/xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyVehicleCountBiz.java
@@ -26,9 +26,11 @@ public class BranchCompanyVehicleCountBiz extends BaseBiz<BranchCompanyVehicleCo
 		Iterator<BranchCompanyVehicleCount> iterator = branchCompanyVehicleCounts.iterator();
 		while (iterator.hasNext()) {
 			BranchCompanyVehicleCount newValue = iterator.next();
-			BranchCompanyVehicleCount oldValue = selectOne(newValue);
-			if (oldValue != null) {
-				iterator.remove();
+			if(newValue != null) {
+				BranchCompanyVehicleCount oldValue = selectOne(newValue);
+				if (oldValue != null) {
+					iterator.remove();
+				}
 			}
 		}
 		insertMultiSelective(branchCompanyVehicleCounts);