From 0dd7b201bb1c4ae999a692643cab2723bcd98916 Mon Sep 17 00:00:00 2001
From: 王彬 <wangbin@taover.com>
Date: Fri, 19 Feb 2021 15:39:03 +0800
Subject: [PATCH] rows 在mysql 8.0是关键字，不能使用简写别名

---
 build.gradle                                                | 2 +-
 src/main/java/com/taover/repository/CustomJdbcTemplate.java | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index fd1573c..353b738 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,7 +55,7 @@ uploadArchives {
                 authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD)
             }
             pom.project {
-                version '2.1.30'
+                version '2.1.32'
                 artifactId ARTIFACT_Id
                 groupId GROUP_ID
                 packaging TYPE
diff --git a/src/main/java/com/taover/repository/CustomJdbcTemplate.java b/src/main/java/com/taover/repository/CustomJdbcTemplate.java
index add2b9b..a197f45 100644
--- a/src/main/java/com/taover/repository/CustomJdbcTemplate.java
+++ b/src/main/java/com/taover/repository/CustomJdbcTemplate.java
@@ -668,14 +668,14 @@ public class CustomJdbcTemplate<T, ID extends Serializable> {
 		String querySql = selectSql+" "+fromAndWhereSql+" "+orderByPartSql+" "+UtilsSql.getLimitCondition(page, pageSize);
 		
 		//构造统计计数语句
-		String countSql = "select count(*) rows from ( select 1 "+fromAndWhereSql+" ) t ";
+		String countSql = "select count(*) rowsCount from ( select 1 "+fromAndWhereSql+" ) t ";
 		
 		//执行查询
 		List<Map<String, Object>> queryData = new ArrayList<Map<String, Object>>();
 		Map<String, Object> countData = new HashMap<String, Object>();	
 		queryData = this.jdbcTemplateRead.queryForList(querySql);
 		countData = this.jdbcTemplateRead.queryForMap(countSql);		
-		return UtilsSql.createPage(page, pageSize, Integer.valueOf(countData.get("rows").toString()), queryData);
+		return UtilsSql.createPage(page, pageSize, Integer.valueOf(countData.get("rowsCount").toString()), queryData);
 	}
 	
 	public <E> Map<String, Object> getBeanPageData(String coreSql, String orderByPartSql, Integer page, Integer pageSize, Class<E> beanClass){
@@ -692,14 +692,14 @@ public class CustomJdbcTemplate<T, ID extends Serializable> {
 		String querySql = selectSql+" "+fromAndWhereSql+" "+orderByPartSql+" "+UtilsSql.getLimitCondition(page, pageSize);
 		
 		//构造统计计数语句
-		String countSql = "select count(*) rows from ( select 1 "+fromAndWhereSql+" ) t ";
+		String countSql = "select count(*) rowsCount from ( select 1 "+fromAndWhereSql+" ) t ";
 		
 		//执行查询
 		List<E> queryData = new ArrayList<E>();
 		Map<String, Object> countData = new HashMap<String, Object>();	
 		queryData = this.jdbcTemplateRead.queryForList(querySql, beanClass);
 		countData = this.jdbcTemplateRead.queryForMap(countSql);		
-		return UtilsSql.createPage(page, pageSize, Integer.valueOf(countData.get("rows").toString()), queryData);
+		return UtilsSql.createPage(page, pageSize, Integer.valueOf(countData.get("rowsCount").toString()), queryData);
 	}
 
 	/**
--
libgit2 0.21.2