From 5dff87c18f48e0a14440d1225924d35f8de7b00e Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期二, 15 七月 2025 12:31:49 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/controller/OrderController.java | 5 ++++- src/main/java/com/zy/asrs/controller/OrderDetlController.java | 1 + 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java index 7fcaa51..4ce625f 100644 --- a/src/main/java/com/zy/asrs/controller/OrderController.java +++ b/src/main/java/com/zy/asrs/controller/OrderController.java @@ -251,6 +251,7 @@ } param.remove("orderType"); } + wrapper.andNew(); convert(param, wrapper); // List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1)); // List<Long> docIds = new ArrayList<>(); @@ -259,7 +260,9 @@ // docIds.add(pakin.getDocId()); // } // } - return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper)); + Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper); + + return R.ok(orderDetlPage); } diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java index 699134e..76f472a 100644 --- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java +++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java @@ -236,6 +236,7 @@ } param.remove("orderType"); } + wrapper.andNew(); convertLike(param, wrapper); if (!Cools.isEmpty(orderByField)) { wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType)); -- Gitblit v1.9.1