diff --git a/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java b/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java index b899fb3..2aa803b 100644 --- a/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java @@ -22,7 +22,6 @@ import java.net.URLEncoder; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; @Service public class CatchPalletServiceImpl extends ServiceImpl implements CatchPalletService { @@ -34,9 +33,11 @@ public class CatchPalletServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(pallet); - queryWrapper.orderByDesc(CatchPallet::getId); - List list = list(queryWrapper); + List list = lambdaQuery() + .eq(CatchPallet::getSite, pallet.getSite()) + .eq(CatchPallet::getCreateBy, pallet.getCreateBy()) + .orderByDesc(CatchPallet::getId) + .list(); if (list.isEmpty()) { throw new RuntimeException("not find any Pallet Label"); }