diff --git a/src/com/wentch/redkale/source/FilterBeanNode.java b/src/com/wentch/redkale/source/FilterBeanNode.java index 8f9fc7d3b..424e4c5c6 100644 --- a/src/com/wentch/redkale/source/FilterBeanNode.java +++ b/src/com/wentch/redkale/source/FilterBeanNode.java @@ -90,7 +90,7 @@ final class FilterBeanNode extends FilterNode { } final String jc = joinCol.column().isEmpty() ? secinfo.getPrimary().field() : joinCol.column(); if (first) { - joinsb.append(" ").append(joinCol.type().name()).append(" JOIN ").append(secinfo.getTable()) + joinsb.append(" INNER JOIN ").append(secinfo.getTable()) .append(" ").append(alias).append(" ON ").append(secinfo.getSQLColumn("a", jc)).append(" = ").append(secinfo.getSQLColumn(alias, jc)); } newnode.foreignCache = secinfo.getCache(); diff --git a/src/com/wentch/redkale/source/FilterJoinColumn.java b/src/com/wentch/redkale/source/FilterJoinColumn.java index f4552b89a..129cd69d5 100644 --- a/src/com/wentch/redkale/source/FilterJoinColumn.java +++ b/src/com/wentch/redkale/source/FilterJoinColumn.java @@ -10,6 +10,7 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** + * 只支持 INNER JOIN * * @author zhangjx */ @@ -19,11 +20,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) public @interface FilterJoinColumn { - public enum JoinType { //不能支持RIGHT, 因为right获取的主对象都是null - - LEFT, INNER; - } - /** * 关联表 通常join表默认别名为b/c/d/...自增, 被join表默认别名为a * @@ -38,5 +34,4 @@ public @interface FilterJoinColumn { */ String column() default ""; - JoinType type() default JoinType.INNER; }