From 070dd3ec9ad599e9c668351ce3d0bd78b54f9745 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 12 三月 2026 15:10:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/UserController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 9cad12b..ccb1312 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -80,12 +80,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.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(column, val);
}
}
}
@@ -269,6 +271,11 @@
}
user.setPassword(null);
user.setMfaSecret(null);
+ user.setPasskeyCredentialId(null);
+ user.setPasskeyPublicKey(null);
+ user.setPasskeyAlgorithm(null);
+ user.setPasskeySignCount(null);
+ user.setPasskeyTransports(null);
}
}
--
Gitblit v1.9.1