From a1221fcaa6d7712a63f922e60393d959d1a1d386 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 17 四月 2025 16:08:43 +0800
Subject: [PATCH] #优化：收货通知单编辑优化
---
rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 ea2e93f..69e88b9 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
@@ -98,10 +98,13 @@
if (this.isToUnderlineCase) {
key = Utils.toSymbolCase(key, '_');
}
+ String finalKey = key;
if (like && key.contains(timeField)) {
- queryWrapper.like("`" + key + "`", val);
+ queryWrapper.and(wrapper -> wrapper.like("`" + finalKey + "`", val));
+// queryWrapper.like("`" + key + "`", val);
} else {
- queryWrapper.eq("`" + key + "`", val);
+ queryWrapper.and(wrapper -> wrapper.eq("`" + finalKey + "`", val));
+// queryWrapper.eq("`" + key + "`", val);
}
}
}
@@ -148,16 +151,17 @@
columns.add(column);
}
if (!columns.isEmpty()) {
- for (int i=0;i<columns.size();i++){
- String column = columns.get(i);
- String condition = where.getCondition();
-
- if (i == 0) {
- queryWrapper.and(wrapper -> wrapper.like("`" + column + "`", condition));
- } else {
- queryWrapper.or().like("`" + column + "`", condition);
+ queryWrapper.and(wrapper -> {
+ for (int i=0;i<columns.size();i++){
+ String column = columns.get(i);
+ String condition = where.getCondition();
+ if (i == 0) {
+ wrapper.or().like("`" + column + "`", condition);
+ } else {
+ wrapper.or().like("`" + column + "`", condition);
+ }
}
- }
+ });
}
}
return queryWrapper;
--
Gitblit v1.9.1