完善合并字段插件，测试可用

TommyLemon · TommyLemon · commit d5676a6abc41 · 2025-04-20T18:01:13.000+08:00
diff --git a/src/main/java/apijson/framework/APIJSONSQLConfig.java b/src/main/java/apijson/framework/APIJSONSQLConfig.java
@@ -418,4 +418,12 @@ public APIJSONSQLConfig<T, M, L> setColumn(List<String> column) {
 		return this;
 	}
 
+	@Override
+	public String gainKey(String key) {
+		if (ENABLE_COLUMN_CONFIG) {
+			key = ColumnUtil.compatInputKey(key, getTable(), getMethod());
+		}
+		return super.gainKey(key);
+	}
+
 }
diff --git a/src/main/java/apijson/framework/APIJSONSQLExecutor.java b/src/main/java/apijson/framework/APIJSONSQLExecutor.java
@@ -21,7 +21,6 @@
 import java.util.List;
 import java.util.Map;
 
-//import apijson.column.ColumnUtil;
 import org.postgresql.util.PGobject;
 
 import apijson.JSON;
@@ -104,9 +103,9 @@ protected String getKey(
 	) throws Exception {
 
 		String key = super.getKey(config, rs, rsmd, row, table, columnIndex, childMap, keyMap);
-//		if (APIJSONSQLConfig.ENABLE_COLUMN_CONFIG) {
-//			return ColumnUtil.compatOutputKey(key, config.getTable(), config.getMethod());
-//		}
+		if (APIJSONSQLConfig.ENABLE_COLUMN_CONFIG) {
+			return ColumnUtil.compatOutputKey(key, config.getTable(), config.getMethod());
+		}
 
 		return key;
 	}
diff --git a/src/main/java/apijson/framework/ColumnUtil.java b/src/main/java/apijson/framework/ColumnUtil.java
@@ -48,6 +48,9 @@ public class ColumnUtil {
 	public static final Comparator<Integer> DESC_COMPARATOR = new Comparator<Integer>() {
 		@Override
 		public int compare(Integer o1, Integer o2) {
+			if (o2 == null) {
+				return o1 == null ? 0 : -1;
+			}
 			return o2.compareTo(o1);
 		}
 	};
diff --git a/src/main/java/apijson/framework/javax/APIJSONSQLConfig.java b/src/main/java/apijson/framework/javax/APIJSONSQLConfig.java
@@ -411,4 +411,12 @@ public APIJSONSQLConfig<T, M, L> setColumn(List<String> column) {
 		return this;
 	}
 
+	@Override
+	public String gainKey(String key) {
+		if (ENABLE_COLUMN_CONFIG) {
+			key = ColumnUtil.compatInputKey(key, getTable(), getMethod());
+		}
+		return super.gainKey(key);
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -418,4 +418,12 @@ public APIJSONSQLConfig<T, M, L> setColumn(List<String> column) {`
`418`	`418`	`return this;`
`419`	`419`	`}`
`420`	`420`
	`421`	`+ @Override`
	`422`	`+ public String gainKey(String key) {`
	`423`	`+ if (ENABLE_COLUMN_CONFIG) {`
	`424`	`+ key = ColumnUtil.compatInputKey(key, getTable(), getMethod());`
	`425`	`+ }`
	`426`	`+ return super.gainKey(key);`
	`427`	`+ }`
	`428`	`+`
`421`	`429`	`}`
Original file line number	Diff line number	Diff line change
`@@ -411,4 +411,12 @@ public APIJSONSQLConfig<T, M, L> setColumn(List<String> column) {`
`411`	`411`	`return this;`
`412`	`412`	`}`
`413`	`413`
	`414`	`+ @Override`
	`415`	`+ public String gainKey(String key) {`
	`416`	`+ if (ENABLE_COLUMN_CONFIG) {`
	`417`	`+ key = ColumnUtil.compatInputKey(key, getTable(), getMethod());`
	`418`	`+ }`
	`419`	`+ return super.gainKey(key);`
	`420`	`+ }`
	`421`	`+`
`414`	`422`	`}`