canrd-outside / order-erp · Commits

Commit ca1e6a436b7d42db902aa75c9e937369f9a1b96a

Authored by zhongnanhuang
1 parent 338ae5cd
build: skipped

订单选中导出

Inline Side-by-side
Showing 1 changed file with 17 additions and 9 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @ca1e6a4
... ... @@ -1329,18 +1329,26 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
1329 1329 }
1330 1330  
1331 1331 //wmr：修改代码，导出指定的订单，2023.12.28
1332   - if (!CollectionUtils.isEmpty(queryVO.getFieldVO().getOrderIds())) {
1333   - if (CollectionUtils.isNotEmpty(orderIds)) {
1334   - Set<Long> collect = queryVO.getFieldVO().getOrderIds().stream()
1335   - .filter(orderIds::contains)
1336   - .collect(Collectors.toSet());
  1332 +// if (queryVO.getFieldVO()!=null&&!CollectionUtils.isEmpty(queryVO.getFieldVO().getOrderIds())) {
  1333 +// if (CollectionUtils.isNotEmpty(orderIds)) {
  1334 +// Set<Long> collect = queryVO.getFieldVO().getOrderIds().stream()
  1335 +// .filter(orderIds::contains)
  1336 +// .collect(Collectors.toSet());
  1337 +// queryVO.setOrderIds(collect);
  1338 +// }
  1339 +// } else {
  1340 +// if (CollectionUtils.isNotEmpty(orderIds)) {
  1341 +// queryVO.setOrderIds(orderIds);
  1342 +// }
  1343 +// }
  1344 +
  1345 + if(queryVO.getFieldVO()!=null&&queryVO.getFieldVO().getOrderIds()!=null){
  1346 + Set<Long> collect = new HashSet<>(queryVO.getFieldVO().getOrderIds());
  1347 + if (collect.size()>0){
1337 1348 queryVO.setOrderIds(collect);
1338 1349 }
1339   - } else {
1340   - if (CollectionUtils.isNotEmpty(orderIds)) {
1341   - queryVO.setOrderIds(orderIds);
1342   - }
1343 1350 }
  1351 +
1344 1352 return new LambdaQueryWrapper<OrderBaseInfoDO>()
1345 1353 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
1346 1354 .eq(StringUtils.isNotBlank(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
... ...