Skip to content

Commit 3a10c11

Browse files
committed
[Bug修复](master):代码生成页面分页功能BUG
close #667
1 parent 6c75df5 commit 3a10c11

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

Diff for: eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
import javax.servlet.http.HttpServletResponse;
4343
import java.io.File;
4444
import java.io.IOException;
45+
import java.math.BigDecimal;
46+
import java.math.BigInteger;
4547
import java.util.ArrayList;
4648
import java.util.List;
4749
import java.util.Map;
@@ -75,19 +77,22 @@ public Object getTables(String name, int[] startEnd) {
7577
// 使用预编译防止sql注入
7678
String sql = "select table_name ,create_time , engine, table_collation, table_comment from information_schema.tables " +
7779
"where table_schema = (select database()) " +
78-
"and table_name like ? order by create_time desc";
80+
"and table_name like :table order by create_time desc";
7981
Query query = em.createNativeQuery(sql);
8082
query.setFirstResult(startEnd[0]);
8183
query.setMaxResults(startEnd[1] - startEnd[0]);
82-
query.setParameter(1, StringUtils.isNotBlank(name) ? ("%" + name + "%") : "%%");
84+
query.setParameter("table", StringUtils.isNotBlank(name) ? ("%" + name + "%") : "%%");
8385
List result = query.getResultList();
8486
List<TableInfo> tableInfos = new ArrayList<>();
8587
for (Object obj : result) {
8688
Object[] arr = (Object[]) obj;
8789
tableInfos.add(new TableInfo(arr[0], arr[1], arr[2], arr[3], ObjectUtil.isNotEmpty(arr[4]) ? arr[4] : "-"));
8890
}
89-
Query query1 = em.createNativeQuery("SELECT COUNT(*) from information_schema.tables where table_schema = (select database())");
90-
Object totalElements = query1.getSingleResult();
91+
String countSql = "select count(1) from information_schema.tables " +
92+
"where table_schema = (select database()) and table_name like :table";
93+
Query queryCount = em.createNativeQuery(countSql);
94+
queryCount.setParameter("table", StringUtils.isNotBlank(name) ? ("%" + name + "%") : "%%");
95+
Object totalElements = queryCount.getSingleResult();
9196
return PageUtil.toPage(tableInfos, totalElements);
9297
}
9398

0 commit comments

Comments
 (0)