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

[代码优化](v2.6)：@Query 加入 NOT_IN 查询

pull/630/head
Zheng Jie 2021-03-20 14:17:50 +08:00
parent 8c6571f1c8
commit e1c434b854
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-common/src/main/java/me/zhengjie/annotation/Query.java
View File

@ -65,6 +65,8 @@ public @interface Query {
, LESS_THAN_NQ , LESS_THAN_NQ
// jie 2019/6/4 包含 // jie 2019/6/4 包含
, IN , IN
// 不包含
, NOT_IN
// 不等于 // 不等于
,NOT_EQUAL ,NOT_EQUAL
// between // between

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

@ -141,8 +141,13 @@ public class QueryHelp {
.as(String.class), val.toString() + "%")); .as(String.class), val.toString() + "%"));
break; break;
case IN: case IN:
if (CollUtil.isNotEmpty((Collection<Long>)val)) { if (CollUtil.isNotEmpty((Collection<Object>)val)) {
list.add(getExpression(attributeName,join,root).in((Collection<Long>) val)); list.add(getExpression(attributeName,join,root).in((Collection<Object>) val));
}
break;
case NOT_IN:
if (CollUtil.isNotEmpty((Collection<Object>)val)) {
list.add(getExpression(attributeName,join,root).in((Collection<Object>) val).not());
} }
break; break;
case NOT_EQUAL: case NOT_EQUAL: