diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java index 28f5bfc5..5bbe5438 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java @@ -65,17 +65,15 @@ public class WmsOrderServiceImpl implements IWmsOrderService { lqw.eq(StringUtils.isNotBlank(bo.getSalesManager()), WmsOrder::getSalesManager, bo.getSalesManager()); // 修改为order_status不是零就查出来 if (bo.getOrderStatus() != null) { - if (bo.getOrderStatus() == 0) { - // 当orderStatus为0时,查询所有记录(不添加筛选条件) + if (bo.getOrderStatus() == -1) { + // 当orderStatus为-1时,查询所有非0状态的记录 + lqw.ne(WmsOrder::getOrderStatus, 0); } else { - // 当orderStatus不为0且不为null时,按指定状态查询 + // 当orderStatus为其他值时(包括0),按指定状态查询 lqw.eq(WmsOrder::getOrderStatus, bo.getOrderStatus()); } - } else { - // 当orderStatus为null时,查询所有非0状态的记录 - lqw.ne(WmsOrder::getOrderStatus, 0); } - + // 当orderStatus为null时不添加任何条件,查询所有记录 return lqw; }