mirror of https://github.com/elunez/eladmin
parent
a24d4f774e
commit
73eb350172
|
@ -80,8 +80,8 @@ public @interface Query {
|
|||
* 适用于简单连接查询,复杂的请自定义该注解,或者使用sql查询
|
||||
*/
|
||||
enum Join {
|
||||
/** jie 2019-6-4 13:18:30 左右连接 */
|
||||
LEFT, RIGHT
|
||||
/** jie 2019-6-4 13:18:30 */
|
||||
LEFT, RIGHT, INNER
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -100,6 +100,13 @@ public class QueryHelp {
|
|||
join = root.join(name, JoinType.RIGHT);
|
||||
}
|
||||
break;
|
||||
case INNER:
|
||||
if(ObjectUtil.isNotNull(join) && ObjectUtil.isNotNull(val)){
|
||||
join = join.join(name, JoinType.INNER);
|
||||
} else {
|
||||
join = root.join(name, JoinType.INNER);
|
||||
}
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue