diff --git a/src_app_fresh/apx/com/amarsoft/als/base/awe/AbstractAweDoQueryManage.java b/src_app_fresh/apx/com/amarsoft/als/base/awe/AbstractAweDoQueryManage.java index 05a4a4780..1f61720bb 100644 --- a/src_app_fresh/apx/com/amarsoft/als/base/awe/AbstractAweDoQueryManage.java +++ b/src_app_fresh/apx/com/amarsoft/als/base/awe/AbstractAweDoQueryManage.java @@ -862,8 +862,10 @@ public abstract class AbstractAweDoQueryManage extends AbstractAweDoHandler { int pageIndexStart = (iPageIndex) * iLimit; int pageIndexEnd = (iPageIndex + 1) * iLimit; // DATA COUNT 停留浮标 + //int iDataCount = StringX.isSpace(sDataCount) ? Integer + // .valueOf(pageIndexStart) : Integer.valueOf(sDataCount) + 1; int iDataCount = StringX.isSpace(sDataCount) ? Integer - .valueOf(pageIndexStart) : Integer.valueOf(sDataCount) + 1; + .valueOf(pageIndexStart) : Integer.valueOf(sDataCount); // 获取SQL查询value及item name 赋予library中 // 为null 或 "" 不处理过滤 @@ -872,7 +874,7 @@ public abstract class AbstractAweDoQueryManage extends AbstractAweDoHandler { boolean flag = false; // filter result // 数据数量大于list数据 if (iDataCount > (rtBos.size() - 1)) { - iDataCount--; + //iDataCount--; break; } if (iPageIndex + 1 < 1) { @@ -1242,7 +1244,7 @@ public abstract class AbstractAweDoQueryManage extends AbstractAweDoHandler { cols.add(col); } } - iDataCount++; + ++iDataCount; // 1. 没有过滤条件("" or null) // 2. 字段未设置过滤 (library for all - isFilter = 0) // 3. 过滤结果== true(满足一个字段即可) @@ -1263,7 +1265,7 @@ public abstract class AbstractAweDoQueryManage extends AbstractAweDoHandler { ARE.getLog().info("FILTER AFTER RESULT SIZE:" + datas.size()); appResult.put("record_num", datas.size()); appResult.put("datas", datas); - appResult.put("dataCount", ++iDataCount); + appResult.put("dataCount", iDataCount); appResult.put("sumCount", rtBos.size()); sFilters = sFilters.length() > 0 ? sFilters.substring(0, sFilters.length() - 1) : sFilters;