mp工具类

sd-framework/src/main/java/com/sd/framework/util/sql/From.java

@@ -32,15 +32,15 @@ public class From<T> extends Where<T> {
     }
 
     public <K, V> From<T> rightJoin(Class<K> cls1, SFunction<K, ?> on1, SFunction<V, ?> on2) {
-        return leftJoin(sql.getTableAlias(cls1), cls1, on1, sql.getTableAlias(on2), on2);
+        return rightJoin(sql.getTableAlias(cls1), cls1, on1, sql.getTableAlias(on2), on2);
     }
 
     public <K, V> From<T> rightJoin(Class<K> cls1, SFunction<K, ?> on1, String as2, SFunction<V, ?> on2) {
-        return leftJoin(sql.getTableAlias(cls1), cls1, on1, as2, on2);
+        return rightJoin(sql.getTableAlias(cls1), cls1, on1, as2, on2);
     }
 
     public <K, V> From<T> rightJoin(String as1, Class<K> cls1, SFunction<K, ?> on1, SFunction<V, ?> on2) {
-        return leftJoin(as1, cls1, on1, sql.getTableAlias(on2), on2);
+        return rightJoin(as1, cls1, on1, sql.getTableAlias(on2), on2);
     }
 
     public <K, V> From<T> rightJoin(String as1, Class<K> cls1, SFunction<K, ?> on1, String as2, SFunction<V, ?> on2) {
@@ -50,15 +50,15 @@ public class From<T> extends Where<T> {
     }
 
     public <K, V> From<T> innerJoin(Class<K> cls1, SFunction<K, ?> on1, SFunction<V, ?> on2) {
-        return leftJoin(sql.getTableAlias(cls1), cls1, on1, sql.getTableAlias(on2), on2);
+        return innerJoin(sql.getTableAlias(cls1), cls1, on1, sql.getTableAlias(on2), on2);
     }
 
     public <K, V> From<T> innerJoin(Class<K> cls1, SFunction<K, ?> on1, String as2, SFunction<V, ?> on2) {
-        return leftJoin(sql.getTableAlias(cls1), cls1, on1, as2, on2);
+        return innerJoin(sql.getTableAlias(cls1), cls1, on1, as2, on2);
     }
 
     public <K, V> From<T> innerJoin(String as1, Class<K> cls1, SFunction<K, ?> on1, SFunction<V, ?> on2) {
-        return leftJoin(as1, cls1, on1, sql.getTableAlias(on2), on2);
+        return innerJoin(as1, cls1, on1, sql.getTableAlias(on2), on2);
     }
 
     public <K, V> From<T> innerJoin(String as1, Class<K> cls1, SFunction<K, ?> on1, String as2, SFunction<V, ?> on2) {