From af1df4e84a7a48bdc9296f681fa33c7345eb642c Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 23 三月 2026 20:06:46 +0800
Subject: [PATCH] 修复
---
src/main/java/com/zy/asrs/controller/WrkMastController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index dec4c89..6cb5cd6 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -65,13 +65,16 @@
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- String val = String.valueOf(entry.getValue());
+ String val = normalizeFilterText(entry.getValue());
+ if (Cools.isEmpty(val)) {
+ continue;
+ }
if (val.contains(RANGE_TIME_LINK)){
String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0].trim()));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1].trim()));
} else {
- wrapper.eq(entry.getKey(), val);
+ wrapper.eq(entry.getKey(), resolveFilterValue(WrkMast.class, entry.getKey(), val));
}
}
}
--
Gitblit v1.9.1