From e6085ab0f6e388573f72595d98c85c6c6123768c Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Thu, 23 Mar 2023 14:08:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=20https://?= =?UTF-8?q?github.com/elunez/eladmin/pull/792=20https://github.com/elunez/?= =?UTF-8?q?eladmin/pull/789?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/me/zhengjie/utils/QueryHelp.java | 6 ++++-- .../src/main/java/me/zhengjie/utils/RedisUtils.java | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java index 69cb5e24..671fff71 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java @@ -161,8 +161,10 @@ public class QueryHelp { break; case BETWEEN: List between = new ArrayList<>((List)val); - list.add(cb.between(getExpression(attributeName, join, root).as((Class) between.get(0).getClass()), - (Comparable) between.get(0), (Comparable) between.get(1))); + if(between.size() == 2){ + list.add(cb.between(getExpression(attributeName, join, root).as((Class) between.get(0).getClass()), + (Comparable) between.get(0), (Comparable) between.get(1))); + } break; default: break; } diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java index b49b3ca5..eb292ed9 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java @@ -185,7 +185,8 @@ public class RedisUtils { } else { Set keySet = new HashSet<>(); for (String key : keys) { - keySet.addAll(redisTemplate.keys(key)); + if (redisTemplate.hasKey(key)) + keySet.add(key); } long count = redisTemplate.delete(keySet); log.debug("--------------------------------------------");