From 58b4f500c4f28f9b16e1419bd1764143d0d7f615 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Mon, 1 Apr 2019 00:04:10 +0800
Subject: [PATCH] =?UTF-8?q?Server:=E5=A2=9E=E5=BC=BA=20LEFT=20JOIN=20?=
 =?UTF-8?q?=E5=92=8C=20RIGHT=20JOIN=20=EF=BC=8C=E6=94=AF=E6=8C=81=20"join"?=
 =?UTF-8?q?:=20{=20"</Comment/momentId@":=20{=20"@group":"userId"=20}=20}?=
 =?UTF-8?q?=20=E5=AE=9A=E5=88=B6=E5=AD=90=E6=9F=A5=E8=AF=A2=E5=A4=96?=
 =?UTF-8?q?=E5=B1=82=E7=9A=84=20GROUP=20BY?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apijson/server/AbstractSQLConfig.java     | 42 +++++++++++++++----
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java
index dca39b727..53512c3b2 100755
--- a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java
+++ b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java
@@ -305,16 +305,42 @@ public AbstractSQLConfig setGroup(String group) {
 	}
 	@JSONField(serialize = false)
 	public String getGroupString(boolean hasPrefix) {
-		//TODO 加上子表的group
+		//加上子表的 group
+		String joinGroup = "";
+		if (joinList != null) {
+			SQLConfig ecfg;
+			SQLConfig cfg;
+			String c;
+			boolean first = true;
+			for (Join j : joinList) {
+				if (j.isAppJoin()) {
+					continue;
+				}
 
-		group = StringUtil.getTrimedString(group);
-		if (group.isEmpty()) {
-			return "";
-		}
+				ecfg = j.getOutterConfig();
+				if (ecfg != null && ecfg.getGroup() != null) { //优先级更高
+					cfg = ecfg;
+				}
+				else {
+					cfg = j.getJoinConfig();
+				}
+
+				cfg.setAlias(cfg.getTable());
+
+				c = ((AbstractSQLConfig) cfg).getGroupString(false);
+				if (StringUtil.isEmpty(c, true) == false) {
+					joinGroup += (first ? "" : ", ") + c;
+					first = false;
+				}
 
+			}
+		}
+		
+		
+		group = StringUtil.getTrimedString(group);
 		String[] keys = StringUtil.split(group);
 		if (keys == null || keys.length <= 0) {
-			return "";
+			return StringUtil.isEmpty(joinGroup, true) ? "" : (hasPrefix ? " GROUP BY " : "") + joinGroup;
 		}
 
 		for (int i = 0; i < keys.length; i++) {
@@ -327,7 +353,7 @@ public String getGroupString(boolean hasPrefix) {
 			keys[i] = getKey(keys[i]);
 		}
 
-		return " GROUP BY " + StringUtil.getString(keys);
+		return (hasPrefix ? " GROUP BY " : "") + StringUtil.concat(StringUtil.getString(keys), joinGroup, ", ");
 	}
 
 	@Override
@@ -435,7 +461,7 @@ public AbstractSQLConfig setOrder(String order) {
 	}
 	@JSONField(serialize = false)
 	public String getOrderString(boolean hasPrefix) {
-		//加上子表的 Order
+		//加上子表的 order
 		String joinOrder = "";
 		if (joinList != null) {
 			SQLConfig ecfg;