|
@@ -111,12 +111,19 @@ public class Sql implements IFormat {
|
|
|
List<QueryColumn> groupByList = sql.groupByList;
|
|
|
List<QueryConditionOrder> orderByList = sql.orderByList;
|
|
|
|
|
|
- // select fields from table join table on
|
|
|
- StringBuilder sqlBuilder = new StringBuilder()
|
|
|
- .append(SqlConstant.SELECT)
|
|
|
- .append(listFormatSql(queryFieldsList, StringPool.COMMA))
|
|
|
- .append(SqlConstant.FROM)
|
|
|
- .append(getQueryTablesSql(queryTableList));
|
|
|
+ // select
|
|
|
+ StringBuilder sqlBuilder = new StringBuilder().append(SqlConstant.SELECT);
|
|
|
+
|
|
|
+ // fields
|
|
|
+ String queryFields = listFormatSql(queryFieldsList, StringPool.COMMA);
|
|
|
+ if (StrUtil.isBlank(queryFields)) {
|
|
|
+ sqlBuilder.append(StringPool.ASTERISK);
|
|
|
+ } else {
|
|
|
+ sqlBuilder.append(queryFields);
|
|
|
+ }
|
|
|
+
|
|
|
+ // from table join table on
|
|
|
+ sqlBuilder.append(SqlConstant.FROM).append(getQueryTablesSql(queryTableList));
|
|
|
|
|
|
// where 条件
|
|
|
String where = listFormatSql(queryConditionList, SqlConstant.AND);
|