From 85f15182f6a6d97ad86739967e59e80299e1b98f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 09 九月 2025 14:14:10 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/domain/PageParam.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/domain/PageParam.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/domain/PageParam.java
index 58fc04b..f50fd66 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/domain/PageParam.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/domain/PageParam.java
@@ -67,15 +67,19 @@
}
public QueryWrapper<T> buildWrapper(Consumer<QueryWrapper<T>> consumer) {
- return this.buildWrapper(false, consumer);
+ return this.buildWrapper(false, consumer, false);
+ }
+
+ public QueryWrapper<T> ignoreWrapper(boolean order) {
+ return this.buildWrapper(false, null, order);
}
public QueryWrapper<T> buildWrapper(boolean like) {
- return this.buildWrapper(like, null);
+ return this.buildWrapper(like, null, false);
}
@SuppressWarnings("all")
- public QueryWrapper<T> buildWrapper(boolean like, Consumer<QueryWrapper<T>> consumer) {
+ public QueryWrapper<T> buildWrapper(boolean like, Consumer<QueryWrapper<T>> consumer, boolean order) {
QueryWrapper<T> queryWrapper = new QueryWrapper<>();
Map<String, Object> map = where.getMap();
for (String key : map.keySet()) {
@@ -132,7 +136,7 @@
}
Field[] fields = null;
- if (!Cools.isEmpty(cls)) {
+ if (!Cools.isEmpty(cls) && !order) {
fields = Cools.getAllFields(cls);
for (Field field : fields) {
if ("id".equals(field.getName())) {
--
Gitblit v1.9.1