From d5ebac1efe04615795c939fa6d6032b233bc4e79 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期四, 18 七月 2024 17:34:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBaseServiceI.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBaseServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBaseServiceI.java index 491fee7..4fbf26c 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBaseServiceI.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBaseServiceI.java @@ -63,7 +63,7 @@ } } String baseSql = "select oid,to_char(ts,'yyyy-mm-dd hh24:mi:ss') as ts,creator,to_char(createTime,'yyyy-mm-dd hh24:mi:ss') as createTime,modifier,to_char(modifyTime,'yyyy-mm-dd hh24:mi:ss') as modifyTime,name,label," + - ("plenum".equalsIgnoreCase(tableName)?" '' as " :"") + "description from " + tableName + ("plenumtype".equalsIgnoreCase(tableName)?" '' as " :"") + "description from " + tableName + (StringUtils.isNotBlank(whereSql)?(" where " + whereSql):""); baseSql += " order by lower(name) asc "; String sql = (StringUtils.isNotBlank(pageSql)?" select oid,ts,creator,createTime,modifier,modifyTime,name,label,description from (select A.* , rownum RN from (":"") @@ -99,7 +99,7 @@ dataList.add(obj); }); dataGrid.setData(dataList); - List<Map> maps = boService.queryBySqlForMap("select count(oid) as total from plbtmtype " + (StringUtils.isNotBlank(whereSql)?(" where " + whereSql):""), null); + List<Map> maps = boService.queryBySqlForMap("select count(*) as total from "+ tableName + (StringUtils.isNotBlank(whereSql)?(" where " + whereSql):""), null); dataGrid.setTotal(VciBaseUtil.getInt(maps.get(0).get("total").toString())); } return dataGrid; -- Gitblit v1.9.3