mirror of https://github.com/elunez/eladmin
代码优化
https://github.com/elunez/eladmin/pull/792 https://github.com/elunez/eladmin/pull/789pull/794/head
parent
f3cdf8ccfc
commit
e6085ab0f6
|
@ -161,8 +161,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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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("--------------------------------------------");
|
||||||
|
|
Loading…
Reference in New Issue