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

🐛 修复QueryHelp::getPredicate查询会产生多余的Join

pull/328/head
ZhengJie 2020-04-03 22:01:06 +08:00
parent 3694add6c1
commit 1f856a1d4b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,14 +56,14 @@ public class QueryHelp {
for (String name : joinNames) { for (String name : joinNames) {
switch (q.join()) { switch (q.join()) {
case LEFT: case LEFT:
if(ObjectUtil.isNotNull(join)){ if(ObjectUtil.isNotNull(join) && ObjectUtil.isNotNull(val)){
join = join.join(name, JoinType.LEFT); join = join.join(name, JoinType.LEFT);
} else { } else {
join = root.join(name, JoinType.LEFT); join = root.join(name, JoinType.LEFT);
} }
break; break;
case RIGHT: case RIGHT:
if(ObjectUtil.isNotNull(join)){ if(ObjectUtil.isNotNull(join) && ObjectUtil.isNotNull(val)){
join = join.join(name, JoinType.RIGHT); join = join.join(name, JoinType.RIGHT);
} else { } else {
join = root.join(name, JoinType.RIGHT); join = root.join(name, JoinType.RIGHT);