解决表对象中的子表对象数据总是一样以及在 Table[]:{ Table:{ ChildTable:{} } } 情况下只有首个 Table 里返回了 ChildTable

TommyLemon · TommyLemon · commit 8d780ddcb0e1 · 2021-09-27T15:20:33.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
@@ -112,7 +112,16 @@ public AbstractObjectParser(@NotNull JSONObject request, String parentPath, SQLC
 
 	}
 
-
+	@Override
+	public String getParentPath() {
+		return parentPath;
+	}
+	
+	@Override
+	public AbstractObjectParser setParentPath(String parentPath) {
+		this.parentPath = parentPath;
+		return this;
+	}
 
 	protected int position;
 	public int getPosition() {
@@ -144,7 +153,6 @@ public boolean isBreakParse() {
 	protected String table;
 	protected String alias;
 	protected boolean isReuse;
-	protected String parentName;
 	protected String path;
 
 	protected JSONObject response;
@@ -824,7 +832,7 @@ public void onChildResponse() throws Exception {
 					continue;
 				}
 
-				response.put(entry.getKey(), child );
+				response.put(entry.getKey(), child);
 				index ++;
 			}
 		}
@@ -856,14 +864,14 @@ public JSONObject onSQLExecute() throws Exception {
 				
 				isSimpleArray = (functionMap == null || functionMap.isEmpty())
 						&& (customMap == null || customMap.isEmpty())
+						&& (childMap == null || childMap.isEmpty())
 						&& (table.equals(arrayTable));
 				
 				// 提取并缓存数组主表的列表数据
 				rawList = (List<JSONObject>) result.remove(SQLExecutor.KEY_RAW_LIST);
 				if (rawList != null) {
 					String arrayPath = parentPath.substring(0, parentPath.lastIndexOf("[]") + 2);
 
-
 					if (isSimpleArray == false) {
 						long startTime = System.currentTimeMillis();
 						
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
@@ -855,6 +855,7 @@ public JSONObject onObjectParse(final JSONObject request
 		ObjectParser op = null;
 		if (isReuse) {  // 数组主表使用专门的缓存数据
 			op = arrayObjectParserCacheMap.get(parentPath.substring(0, parentPath.lastIndexOf("[]") + 2));
+			op.setParentPath(parentPath);
 		}
 
 		if (op == null) {
diff --git a/APIJSONORM/src/main/java/apijson/orm/ObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/ObjectParser.java
@@ -20,6 +20,9 @@
  */
 public interface ObjectParser {
 
+	String getParentPath();
+	ObjectParser setParentPath(String parentPath);
+
 	/**解析成员
 	 * response重新赋值
 	 * @param parentPath 
@@ -140,7 +143,6 @@ public interface ObjectParser {
 	void recycle();
 
 
-
 	ObjectParser setMethod(RequestMethod method);
 	RequestMethod getMethod();
 

Original file line number	Diff line number	Diff line change
`@@ -855,6 +855,7 @@ public JSONObject onObjectParse(final JSONObject request`
`855`	`855`	`ObjectParser op = null;`
`856`	`856`	`if (isReuse) { // 数组主表使用专门的缓存数据`
`857`	`857`	`op = arrayObjectParserCacheMap.get(parentPath.substring(0, parentPath.lastIndexOf("[]") + 2));`
	`858`	`+ op.setParentPath(parentPath);`
`858`	`859`	`}`
`859`	`860`
`860`	`861`	`if (op == null) {`