Merge branch 'pre-production'

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncWarehouseData.java

@@ -1,5 +1,6 @@
 package com.logpm.patch.jobhandle;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONObject;
 import com.logpm.basicdata.entity.*;
 import com.logpm.basicdata.feign.*;
@@ -409,7 +410,7 @@ public class SyncWarehouseData {
 							//把packageTrayInfoVOS1中的orderPackageCode放入一个List
 							List<String> orderPackageCodeList = packageTrayInfoVOS1.stream().map(PackageTrayInfoVO::getOrderPackageCode).collect(Collectors.toList());
 							List<String> list = delTrayAndAllocationPackageMap.get(warehouseId);
-							if(list.isEmpty()){
+							if(CollUtil.isEmpty(list)){
 								delTrayAndAllocationPackageMap.put(warehouseId,orderPackageCodeList);
 							}else{
 								list.addAll(orderPackageCodeList);
@@ -531,7 +532,7 @@ public class SyncWarehouseData {
 							//把packageTrayInfoVOS1中的orderPackageCode放入一个List
 							List<String> orderPackageCodeList = packageAllocationInfoVOS1.stream().map(PackageAllocationInfoVO::getOrderPackageCode).collect(Collectors.toList());
 							List<String> list = delTrayAndAllocationPackageMap.get(warehouseId);
-							if(list.isEmpty()){
+							if(CollUtil.isEmpty(list)){
 								delTrayAndAllocationPackageMap.put(warehouseId,orderPackageCodeList);
 							}else{
 								list.addAll(orderPackageCodeList);