Skip to content

J
jiedao-api-boot-master
Commit 61b11b55 authored by huyf's avatar huyf
Browse files
Options

误提交。注释代码

parent 8eba1aa4
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java
View file @ 61b11b55
...@@ -1575,12 +1575,12 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements ...@@ -1575,12 +1575,12 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
warehouseIdList = warehouseList.stream().map(WarehouseDO::getId).collect(Collectors.toList()); warehouseIdList = warehouseList.stream().map(WarehouseDO::getId).collect(Collectors.toList());
query.setWarehouseIdList(warehouseIdList); query.setWarehouseIdList(warehouseIdList);
} }
if (CollectionUtil.isNotEmpty(query.getCountryIdList())) { // if (CollectionUtil.isNotEmpty(query.getCountryIdList())) {
List<WarehouseDO> warehouseList = // List<WarehouseDO> warehouseList =
warehouseService.findByCountryIdList(query.getCountryIdList()); // warehouseService.findByCountryIdList(query.getCountryIdList());
warehouseIdList = warehouseList.stream().map(WarehouseDO::getId).collect(Collectors.toList()); // warehouseIdList = warehouseList.stream().map(WarehouseDO::getId).collect(Collectors.toList());
query.setWarehouseIdList(warehouseIdList); // query.setWarehouseIdList(warehouseIdList);
} // }
//上面都是处理查询条件相关逻辑 //上面都是处理查询条件相关逻辑
return boxInfoQuery1(boxMapper.selectPage2(page, query), false); return boxInfoQuery1(boxMapper.selectPage2(page, query), false);
} }
......
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