From 7e52962b703cdb572885cc394d039bc635d979fd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 13 三月 2026 13:27:22 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/system/controller/ResourceController.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/system/controller/ResourceController.java b/src/main/java/com/zy/system/controller/ResourceController.java
index 65cc871..f5a36c6 100644
--- a/src/main/java/com/zy/system/controller/ResourceController.java
+++ b/src/main/java/com/zy/system/controller/ResourceController.java
@@ -46,12 +46,14 @@
 
     private void convert(Map<String, Object> map, QueryWrapper wrapper){
         for (Map.Entry<String, Object> entry : map.entrySet()){
-            if (entry.getKey().endsWith(">")) {
-                wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
-            } else if (entry.getKey().endsWith("<")) {
-                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+            String val = String.valueOf(entry.getValue());
+            String column = humpToLine(entry.getKey());
+            if (val.contains(" - ")) {
+                String[] dates = val.split(" - ");
+                wrapper.ge(column, DateUtils.convert(dates[0]));
+                wrapper.le(column, DateUtils.convert(dates[1]));
             } else {
-                wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
+                wrapper.eq(column, val);
             }
         }
     }

--
Gitblit v1.9.1