新增支持子查询对象内省略关键词 from，自动取最上方的表对象 key 作为 from

TommyLemon · TommyLemon · commit 0f1b105c7c8f · 2023-07-08T19:39:01.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
@@ -258,7 +258,7 @@ public AbstractObjectParser parse(String name, boolean isReuse) throws Exception
 						if (obj instanceof JSONObject) {
 							((JSONObject) obj).put(apijson.JSONObject.KEY_METHOD, GET);
 						}
-                        
+
 						try {
                             boolean startsWithAt = key.startsWith("@");
                             //if (startsWithAt || (key.endsWith("()") == false)) {
@@ -372,7 +372,21 @@ public boolean onParse(@NotNull String key, @NotNull Object value) throws Except
 				}
 
 				String from = subquery.getString(JSONRequest.KEY_SUBQUERY_FROM);
-				JSONObject arrObj = from == null ? null : obj.getJSONObject(from);
+				boolean isEmpty = StringUtil.isEmpty(from);
+				JSONObject arrObj = isEmpty ? null : obj.getJSONObject(from);
+				if (isEmpty) {
+					Set<Entry<String, Object>> set = obj.entrySet();
+					for (Entry<String, Object> e : set) {
+						String k = e == null ? null : e.getKey();
+						Object v = k == null ? null : e.getValue();
+						if (v instanceof JSONObject && JSONRequest.isTableKey(k)) {
+							from = k;
+							arrObj = (JSONObject) v;
+							break;
+						}
+					}
+				}
+
 				if (arrObj == null) {
 					throw new IllegalArgumentException("子查询 " + path + "/"
                             + key + ":{ from:value } 中 value 对应的主表对象 " + from + ":{} 不存在！");
