From 13909c99e368788a94a48753dc9f76e40a992cd6 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 29 七月 2024 15:21:06 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/domain/PageParam.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 a1df787..b64e7f6 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
@@ -80,6 +80,9 @@
Map<String, Object> map = where.getMap();
for (String key : map.keySet()) {
Object val = map.get(key);
+ if (val == null) {
+ continue;
+ }
if (key.contains("Range")) {
ArrayList<String> list = null;
@@ -94,6 +97,11 @@
queryWrapper.ge(key, DateUtils.convert(list.get(0)));
queryWrapper.le(key, DateUtils.convert(list.get(1)));
}
+ } else if (val instanceof List) {
+ if (this.isToUnderlineCase) {
+ key = Utils.toSymbolCase(key, '_');
+ }
+ queryWrapper.in(key, (List) val);
} else {
if (this.isToUnderlineCase) {
key = Utils.toSymbolCase(key, '_');
@@ -115,7 +123,9 @@
if (!Cools.isEmpty(cls)) {
fields = Cools.getAllFields(cls);
for (Field field : fields) {
- if ("createTime".equals(field.getName())) {
+ if ("id".equals(field.getName())) {
+ queryWrapper.orderByDesc("id");
+ } else if ("createTime".equals(field.getName())) {
queryWrapper.orderByDesc(Utils.toSymbolCase(field.getName(), '_'));
}
}
--
Gitblit v1.9.1