taov-erp / com-taover-repository

Download as
Browse Code »

Commit 362d2827b2fc33adc7359cbe978e3c3c2951d8a3

Authored by 王彬
1 parent f0611848
Exists in master and in 2 other branches dev_wb, release-2.2.4

remove get page data tenant condition

Showing 2 changed files with 2 additions and 4 deletions   Show diff stats
@@ -57,7 +57,7 @@ uploadArchives { @@ -57,7 +57,7 @@ uploadArchives {
57 authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD) 57 authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD)
58 } 58 }
59 pom.project { 59 pom.project {
60 - version '2.1.44' 60 + version '2.1.46'
61 artifactId ARTIFACT_Id 61 artifactId ARTIFACT_Id
62 groupId GROUP_ID 62 groupId GROUP_ID
63 packaging TYPE 63 packaging TYPE
src/main/java/com/taover/repository/CustomJdbcTemplateWrapperTenant.java
  Diff comments   View file @362d282
@@ -342,7 +342,7 @@ public class CustomJdbcTemplateWrapperTenant<T, ID extends Serializable> impleme @@ -342,7 +342,7 @@ public class CustomJdbcTemplateWrapperTenant<T, ID extends Serializable> impleme
342 342
343 @Override 343 @Override
344 public Map<String, Object> findPageBySql(String sqlCondition, int page, int pageSize, Long tenantId){ 344 public Map<String, Object> findPageBySql(String sqlCondition, int page, int pageSize, Long tenantId){
345 - StringBuffer sql = new StringBuffer("SELECT "+this._tableFieldNameListGapWithComma+" FROM "+this.getTableSql()+" WHERE tenant_id=" + tenantId + " and " + sqlCondition ); 345 + StringBuffer sql = new StringBuffer("SELECT "+this._tableFieldNameListGapWithComma+" FROM "+this.getTableSql()+" WHERE tenant_id=" + tenantId + " and " + sqlCondition);
346 StringBuffer sqlCount = new StringBuffer("SELECT count(1) rowCount FROM "+this.getTableSql()+" WHERE tenant_id=" + tenantId + " and " + sqlCondition); 346 StringBuffer sqlCount = new StringBuffer("SELECT count(1) rowCount FROM "+this.getTableSql()+" WHERE tenant_id=" + tenantId + " and " + sqlCondition);
347 sql.append(" limit ?, ?"); 347 sql.append(" limit ?, ?");
348 List<Object> page_list = new ArrayList<Object>(); 348 List<Object> page_list = new ArrayList<Object>();
@@ -533,8 +533,6 @@ public class CustomJdbcTemplateWrapperTenant&lt;T, ID extends Serializable&gt; impleme @@ -533,8 +533,6 @@ public class CustomJdbcTemplateWrapperTenant&lt;T, ID extends Serializable&gt; impleme
533 533
534 @Override 534 @Override
535 public Map<String, Object> getPageData(String selectSql, String fromAndWhereSql, String orderByPartSql, Integer page, Integer pageSize, Long tenantId){ 535 public Map<String, Object> getPageData(String selectSql, String fromAndWhereSql, String orderByPartSql, Integer page, Integer pageSize, Long tenantId){
536 - fromAndWhereSql = fromAndWhereSql + " and tenant_id="+tenantId;  
537 -  
538 //构造查询语句 536 //构造查询语句
539 String querySql = selectSql+" "+fromAndWhereSql+" "+orderByPartSql+" "+UtilsSql.getLimitCondition(page, pageSize); 537 String querySql = selectSql+" "+fromAndWhereSql+" "+orderByPartSql+" "+UtilsSql.getLimitCondition(page, pageSize);
540 538