提交

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

@@ -31,6 +31,10 @@ public class SqlContext {
         threadLocal.set(map);
     }
 
+    public static void remove() {
+        threadLocal.remove();
+    }
+
     public static void putValue(StringJoiner joiner, Object value) {
         if (value instanceof IFormat iFormat) {
             joiner.add(iFormat.toSql());
@@ -42,15 +46,19 @@ public class SqlContext {
         }
     }
 
-    public static void remove() {
-        threadLocal.remove();
+    public static String getTableDelFlag(Table table) {
+        TableInfo tableInfo = TableInfoHelper.getTableInfo(table.getName());
+        if (!tableInfo.isWithLogicDelete()) {
+            return null;
+        }
+        TableFieldInfo logicDeleteFieldInfo = tableInfo.getLogicDeleteFieldInfo();
+        return logicDeleteFieldInfo.getColumn();
     }
 
     public static String getTableAlias(Table table) {
         Map<String, String> tableAliasMap = getTableAliasMap();
         String tableAlias = table.getAlias();
         String tableName = table.getName();
-
         if (StrUtil.isBlank(tableAlias)) {
             tableAlias = tableAliasMap.get(tableName);
             if (StrUtil.isBlank(tableAlias)) {
@@ -60,6 +68,11 @@ public class SqlContext {
         return tableAlias;
     }
 
+    public static void setTableAliasMap(Sql<?> sql) {
+        Map<String, Object> map = threadLocal.get();
+        map.put(TABLE_ALIAS_MAP, createTableAliasMap(sql));
+    }
+
     private static Map<String, String> createTableAliasMap(Sql<?> sql) {
         List<ITable> queryTableList = sql.queryTableList;
         int number = 1;
@@ -87,26 +100,11 @@ public class SqlContext {
         return tableAliasMap;
     }
 
-    public static String getTableDelFlag(Table table) {
-        TableInfo tableInfo = TableInfoHelper.getTableInfo(table.getName());
-        if (!tableInfo.isWithLogicDelete()) {
-            return null;
-        }
-
-        TableFieldInfo logicDeleteFieldInfo = tableInfo.getLogicDeleteFieldInfo();
-        return logicDeleteFieldInfo.getColumn();
-    }
-
     private static Map<String, String> getTableAliasMap() {
         Map<String, Object> map = threadLocal.get();
         return (Map<String, String>) map.get(TABLE_ALIAS_MAP);
     }
 
-    public static void setTableAliasMap(Sql<?> sql) {
-        Map<String, Object> map = threadLocal.get();
-        map.put(TABLE_ALIAS_MAP, createTableAliasMap(sql));
-    }
-
     private static String getParamKey() {
         Map<String, Object> map = threadLocal.get();
         int paramNumber = (int) map.get(PARAM_NUMBER);