From 92a30abbdc9f65cb1a45a65e39cbfd3f6b52461e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 21 五月 2025 14:06:26 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
index b513578..01bb3f2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
@@ -82,7 +82,9 @@
         Map<String, Object> map = where.getMap();
         for (String key : map.keySet()) {
             Object val = map.get(key);
-
+            if (Cools.isEmpty(val)){
+                continue;
+            }
             if (key.contains("Range")) {
                 ArrayList<String> list = null;
                 if (val instanceof ArrayList) {
@@ -175,7 +177,9 @@
         Map<String, Object> map = where.getMap();
         for (String key : map.keySet()) {
             Object val = map.get(key);
-
+            if (Cools.isEmpty(val)){
+                continue;
+            }
             if (key.contains("Range")) {
                 ArrayList<String> list = null;
                 if (val instanceof ArrayList) {

--
Gitblit v1.9.1