解决表对象当表名有别名时被当成普通对象导致查不到数据

TommyLemon · TommyLemon · commit 4858f02d3f41 · 2021-02-06T19:46:13.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
@@ -853,7 +853,7 @@ public JSONObject onSQLExecute() throws Exception {
 						list.set(i, obj);
 
 						if (obj != null) {
-							parser.putQueryResult(arrayPath + "/" + i + "/" + table, obj); //解决获取关联数据时requestObject里不存在需要的关联数据
+							parser.putQueryResult(arrayPath + "/" + i + "/" + name, obj); //解决获取关联数据时requestObject里不存在需要的关联数据
 						}
 					}
 
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
@@ -790,7 +790,11 @@ public JSONObject onObjectParse(final JSONObject request
 			}
 		}
 		
-		boolean isTable = apijson.JSONObject.isTableKey(name);
+		apijson.orm.Entry<String, String> entry = Pair.parseEntry(name, true);
+		String table = entry.getKey(); //Comment
+		// String alias = entry.getValue(); //to
+
+		boolean isTable = apijson.JSONObject.isTableKey(table);
 		boolean isArrayMainTable = isSubquery == false && isTable && type == SQLConfig.TYPE_ITEM_CHILD_0 && arrayConfig != null && RequestMethod.isGetMethod(arrayConfig.getMethod(), true);
 		boolean isReuse = isArrayMainTable && position > 0;
 

Original file line number	Diff line number	Diff line change
`@@ -853,7 +853,7 @@ public JSONObject onSQLExecute() throws Exception {`
`853`	`853`	`list.set(i, obj);`
`854`	`854`
`855`	`855`	`if (obj != null) {`
`856`		`- parser.putQueryResult(arrayPath + "/" + i + "/" + table, obj); //解决获取关联数据时requestObject里不存在需要的关联数据`
	`856`	`+ parser.putQueryResult(arrayPath + "/" + i + "/" + name, obj); //解决获取关联数据时requestObject里不存在需要的关联数据`
`857`	`857`	`}`
`858`	`858`	`}`
`859`	`859`
Original file line number	Diff line number	Diff line change
`@@ -790,7 +790,11 @@ public JSONObject onObjectParse(final JSONObject request`
`790`	`790`	`}`
`791`	`791`	`}`
`792`	`792`
`793`		`- boolean isTable = apijson.JSONObject.isTableKey(name);`
	`793`	`+ apijson.orm.Entry<String, String> entry = Pair.parseEntry(name, true);`
	`794`	`+ String table = entry.getKey(); //Comment`
	`795`	`+ // String alias = entry.getValue(); //to`
	`796`	`+`
	`797`	`+ boolean isTable = apijson.JSONObject.isTableKey(table);`
`794`	`798`	`boolean isArrayMainTable = isSubquery == false && isTable && type == SQLConfig.TYPE_ITEM_CHILD_0 && arrayConfig != null && RequestMethod.isGetMethod(arrayConfig.getMethod(), true);`
`795`	`799`	`boolean isReuse = isArrayMainTable && position > 0;`
`796`	`800`