From 3e178bf2af5ea0d83b8fb12a75c0d5fef1339fb6 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 25 Mar 2025 11:10:29 +0800
Subject: [PATCH] 20240325

---
 .../pallet/service/impl/CatchPalletServiceImpl.java      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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<CatchPalletMapper, CatchPallet> implements CatchPalletService {
@@ -34,9 +33,11 @@ public class CatchPalletServiceImpl extends ServiceImpl<CatchPalletMapper, Catch
     public void export(HttpServletResponse response, CatchPallet pallet) {
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
-        LambdaQueryWrapper<CatchPallet> queryWrapper = new LambdaQueryWrapper<>(pallet);
-        queryWrapper.orderByDesc(CatchPallet::getId);
-        List<CatchPallet> list = list(queryWrapper);
+        List<CatchPallet> 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");
         }