From 362d2827b2fc33adc7359cbe978e3c3c2951d8a3 Mon Sep 17 00:00:00 2001
From: 王彬 <wangbin@taover.com>
Date: Tue, 23 Mar 2021 19:06:32 +0800
Subject: [PATCH] remove get page data tenant condition

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

diff --git a/build.gradle b/build.gradle
index 99bd486..c310201 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,7 +57,7 @@ uploadArchives {
                 authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD)
             }
             pom.project {
-                version '2.1.44'
+                version '2.1.46'
                 artifactId ARTIFACT_Id
                 groupId GROUP_ID
                 packaging TYPE
diff --git a/src/main/java/com/taover/repository/CustomJdbcTemplateWrapperTenant.java b/src/main/java/com/taover/repository/CustomJdbcTemplateWrapperTenant.java
index 6cbc676..20ba6a7 100644
--- a/src/main/java/com/taover/repository/CustomJdbcTemplateWrapperTenant.java
+++ b/src/main/java/com/taover/repository/CustomJdbcTemplateWrapperTenant.java
@@ -342,7 +342,7 @@ public class CustomJdbcTemplateWrapperTenant<T, ID extends Serializable> impleme
 
 	@Override
 	public Map<String, Object> findPageBySql(String sqlCondition, int page, int pageSize, Long tenantId){
-		StringBuffer sql = new StringBuffer("SELECT "+this._tableFieldNameListGapWithComma+" FROM "+this.getTableSql()+" WHERE tenant_id=" + tenantId + " and " + sqlCondition );
+		StringBuffer sql = new StringBuffer("SELECT "+this._tableFieldNameListGapWithComma+" FROM "+this.getTableSql()+" WHERE tenant_id=" + tenantId + " and " + sqlCondition);
 		StringBuffer sqlCount = new StringBuffer("SELECT count(1) rowCount FROM "+this.getTableSql()+" WHERE tenant_id=" + tenantId + " and " + sqlCondition);
 		sql.append(" limit ?, ?");
 		List<Object> page_list = new ArrayList<Object>();
@@ -533,8 +533,6 @@ public class CustomJdbcTemplateWrapperTenant<T, ID extends Serializable> impleme
 
 	@Override
 	public Map<String, Object> getPageData(String selectSql, String fromAndWhereSql, String orderByPartSql, Integer page, Integer pageSize, Long tenantId){
-		fromAndWhereSql = fromAndWhereSql + " and tenant_id="+tenantId;
-		
 		//构造查询语句
 		String querySql = selectSql+" "+fromAndWhereSql+" "+orderByPartSql+" "+UtilsSql.getLimitCondition(page, pageSize);
 		
--
libgit2 0.21.2