From 17b571c2dde03909d5e886ae06e947654784e20c Mon Sep 17 00:00:00 2001
From: cjn <1067473628@qq.com>
Date: Wed, 1 Jun 2022 07:39:59 +0000
Subject: [PATCH] =?UTF-8?q?update=20magic-api/src/main/java/org/ssssssss/m?=
 =?UTF-8?q?agicapi/modules/db/table/NamedTable.java.=20=E6=AD=A4=E5=A4=84?=
 =?UTF-8?q?=E6=8B=BC=E6=8E=A5sql=E8=AF=AD=E5=8F=A5=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=BD=93order=20by=E5=92=8Cgroup=20by=20=E4=B8=80=E8=B5=B7?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=97=B6=EF=BC=8C=E5=BA=94=E5=BD=93=E5=85=88?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E5=86=8D=E6=8E=92=E5=BA=8F=EF=BC=8Csql?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ssssssss/magicapi/modules/db/table/NamedTable.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/table/NamedTable.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/table/NamedTable.java
index 7305e199..3d393d30 100644
--- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/table/NamedTable.java
+++ b/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/table/NamedTable.java
@@ -484,14 +484,14 @@ public class NamedTable extends Attributes<Object> {
 		}
 		builder.append(" from ").append(tableName);
 		List<Object> params = buildWhere(builder);
+        if (!groups.isEmpty()) {
+			builder.append(" group by ");
+			builder.append(String.join(",", groups));
+		}
 		if (!orders.isEmpty()) {
 			builder.append(" order by ");
 			builder.append(String.join(",", orders));
 		}
-		if (!groups.isEmpty()) {
-			builder.append(" group by ");
-			builder.append(String.join(",", groups));
-		}
 		BoundSql boundSql = new BoundSql(runtimeContext, builder.toString(), params, sqlModule);
 		boundSql.setExcludeColumns(excludeColumns);
 		return boundSql;
-- 
Gitee