Commit 61b11b55 authored by huyf's avatar huyf

误提交。注释代码

parent 8eba1aa4
......@@ -1575,12 +1575,12 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
warehouseIdList = warehouseList.stream().map(WarehouseDO::getId).collect(Collectors.toList());
query.setWarehouseIdList(warehouseIdList);
}
if (CollectionUtil.isNotEmpty(query.getCountryIdList())) {
List<WarehouseDO> warehouseList =
warehouseService.findByCountryIdList(query.getCountryIdList());
warehouseIdList = warehouseList.stream().map(WarehouseDO::getId).collect(Collectors.toList());
query.setWarehouseIdList(warehouseIdList);
}
// if (CollectionUtil.isNotEmpty(query.getCountryIdList())) {
// List<WarehouseDO> warehouseList =
// warehouseService.findByCountryIdList(query.getCountryIdList());
// warehouseIdList = warehouseList.stream().map(WarehouseDO::getId).collect(Collectors.toList());
// query.setWarehouseIdList(warehouseIdList);
// }
//上面都是处理查询条件相关逻辑
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