Merge branch 'jd_dev' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master into jd_dev

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentLoadExcelExportListener2.java

@@ -241,10 +241,12 @@ public class ShipmentLoadExcelExportListener2 {
                                     List<OrderWarehouseInDO> orderWarehouseInDOS = orderWarehouseInService.selectList(OrderWarehouseInDO::getOrderItemId, orderItem.getOrderItemId());
                                     for (OrderWarehouseInDO orderWarehouseInDO : orderWarehouseInDOS) {
                                         List<OrderWarehouseInDetailsVO> warehouseInDetailsVOLists = orderWarehouseInDO.getOrderWarehouseInDetailsVOList();
-                                        for (OrderWarehouseInDetailsVO warehouseInDetailsVOList : warehouseInDetailsVOLists) {
-                                            String attrNames2 = getAttrNameByIds(warehouseInDetailsVOList.getProdAttrIds(), idNameMap);
-                                            if (attrNames2.contains("危险品")){
-                                                prodAttrTag = true;
+                                        if (CollectionUtil.isNotEmpty(warehouseInDetailsVOLists)) {
+                                            for (OrderWarehouseInDetailsVO warehouseInDetailsVOList : warehouseInDetailsVOLists) {
+                                                String attrNames2 = getAttrNameByIds(warehouseInDetailsVOList.getProdAttrIds(), idNameMap);
+                                                if (attrNames2.contains("危险品")){
+                                                    prodAttrTag = true;
+                                                }
                                             }
                                         }
                                     }