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 impleme @Override public Map 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 page_list = new ArrayList(); @@ -533,8 +533,6 @@ public class CustomJdbcTemplateWrapperTenant impleme @Override public Map 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