提交

my-test/src/main/java/org/example/join/sql/Sql.java

@@ -54,16 +54,6 @@ public class Sql implements IFormat {
     }
 
     /**
-     * 拼接sql union
-     */
-    private void appendSql(StringBuilder sqlSb, Sql sql) {
-        sqlSb.append(sql.unionType)
-                .append(StringPool.LEFT_BRACKET)
-                .append(toSql(sql))
-                .append(StringPool.RIGHT_BRACKET);
-    }
-
-    /**
      * sql对象转化为字符串
      */
     private String toSql(Sql sql) {
@@ -74,6 +64,16 @@ public class Sql implements IFormat {
     }
 
     /**
+     * 拼接sql union
+     */
+    private void appendSql(StringBuilder sqlSb, Sql sql) {
+        sqlSb.append(sql.unionType)
+                .append(StringPool.LEFT_BRACKET)
+                .append(toSql(sql))
+                .append(StringPool.RIGHT_BRACKET);
+    }
+
+    /**
      * 拼接逻辑删除
      */
     private void spliceLogic(Sql sql) {

my-test/src/test/java/MySpringBootTest.java

@@ -17,23 +17,30 @@ import java.util.List;
 public class MySpringBootTest {
 
     public static final Table sys_dept = new Table("sys_dept");
-    public final QueryColumn dept_id = new QueryColumn(sys_dept, "dept_id");
-    public final QueryColumn tenant_id = new QueryColumn(sys_dept, "tenant_id");
-    public final QueryColumn parent_id = new QueryColumn(sys_dept, "parent_id");
-    public final QueryColumn ancestors = new QueryColumn(sys_dept, "ancestors");
-    public final QueryColumn status = new QueryColumn(sys_dept, "status");
+    public final QueryColumn dept_id = sys_dept.field("dept_id");
+    public final QueryColumn tenant_id = sys_dept.field("tenant_id");
+    public final QueryColumn parent_id = sys_dept.field("parent_id");
+    public final QueryColumn ancestors = sys_dept.field("ancestors");
+    public final QueryColumn status = sys_dept.field("status");
 
     public static final Table sys_user = new Table("sys_user");
-    public final QueryColumn user_id = new QueryColumn(sys_user, "user_id");
-    public final QueryColumn user_name = new QueryColumn(sys_user, "user_name");
-    public final QueryColumn nick_name = new QueryColumn(sys_user, "nick_name");
-    public final QueryColumn sex = new QueryColumn(sys_user, "sex");
-    public final QueryColumn create_by = new QueryColumn(sys_user, "create_by");
+    public final QueryColumn user_id = sys_user.field("user_id");
+    public final QueryColumn user_name = sys_user.field("user_name");
+    public final QueryColumn nick_name = sys_user.field("nick_name");
+    public final QueryColumn sex = sys_user.field("sex");
+    public final QueryColumn create_by = sys_user.field("create_by");
 
     @Test
     public void testCache() {
 
-        TableSublist childTable = Sql.create().select(dept_id, tenant_id, status).from(sys_dept).asTable(sys_dept);
+        TableSublist childTable = Sql.create()
+                .select(
+                        dept_id,
+                        tenant_id,
+                        status
+                )
+                .from(sys_dept)
+                .asTable(sys_dept);
 
         List<SysDept> list = Sql.create()
                 //.logic()
@@ -47,6 +54,7 @@ public class MySpringBootTest {
                 .from(childTable)
                 .leftJoin(sys_user).on(childTable.field(dept_id).eq(user_id))
                 .where(
+                        dept_id.in(Sql.create().select(dept_id).from(sys_dept)),
                         Sql.create().select(dept_id).from(sys_dept).limit(1).eq(100)
                 )
                 .list(SysDept.class);