github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'elunez:master' into master

pull/729/head
caiming100 2023-03-23 15:21:28 +08:00 committed by GitHub
parent 2ea5e539db e6085ab0f6
commit fb5ac29fbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
View File

@ -169,8 +169,10 @@ public class QueryHelp {
break; break;
case BETWEEN: case BETWEEN:
List<Object> between = new ArrayList<>((List<Object>)val); List<Object> between = new ArrayList<>((List<Object>)val);
list.add(cb.between(getExpression(attributeName, join, root).as((Class<? extends Comparable>) between.get(0).getClass()), if(between.size() == 2){
(Comparable) between.get(0), (Comparable) between.get(1))); list.add(cb.between(getExpression(attributeName, join, root).as((Class<? extends Comparable>) between.get(0).getClass()),
(Comparable) between.get(0), (Comparable) between.get(1)));
}
break; break;
default: break; default: break;
} }

3
eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java
View File

@ -185,7 +185,8 @@ public class RedisUtils {
} else { } else {
Set<Object> keySet = new HashSet<>(); Set<Object> keySet = new HashSet<>();
for (String key : keys) { for (String key : keys) {
keySet.addAll(redisTemplate.keys(key)); if (redisTemplate.hasKey(key))
keySet.add(key);
} }
long count = redisTemplate.delete(keySet); long count = redisTemplate.delete(keySet);
log.debug("--------------------------------------------"); log.debug("--------------------------------------------");