From 107f1e5f1d9b7bc9fa2870ebd3bf725301520a25 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期四, 04 七月 2024 18:01:19 +0800 Subject: [PATCH] # --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/domain/PageParam.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 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..db04a14 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, '_'); -- Gitblit v1.9.1