From bdd5ff3e6d364d7392b87d2294216ebb9ec590e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Candy=E3=83=A1=E5=A5=B6=E7=B3=96?= <359031282@qq.com>
Date: Tue, 28 Jul 2020 19:01:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/me/zhengjie/rest/GeneratorController.java    | 7 +++----
 .../me/zhengjie/service/impl/GeneratorServiceImpl.java     | 5 +++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java
index ce6a17d1..62ee485e 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java
@@ -24,6 +24,7 @@ import me.zhengjie.service.GenConfigService;
 import me.zhengjie.service.GeneratorService;
 import me.zhengjie.utils.PageUtil;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -55,10 +56,8 @@ public class GeneratorController {
 
     @ApiOperation("查询数据库数据")
     @GetMapping(value = "/tables")
-    public ResponseEntity<Object> queryTables(@RequestParam(defaultValue = "") String name,
-                                    @RequestParam(defaultValue = "0")Integer page,
-                                    @RequestParam(defaultValue = "10")Integer size){
-        int[] startEnd = PageUtil.transToStartEnd(page, size);
+    public ResponseEntity<Object> queryTables(@RequestParam(defaultValue = "") String name, Pageable pageable) {
+        int[] startEnd = PageUtil.transToStartEnd(pageable.getPageNumber() + 1, pageable.getPageSize());
         return new ResponseEntity<>(generatorService.getTables(name,startEnd), HttpStatus.OK);
     }
 
diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java
index 1b1803b2..f103e0b3 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java
@@ -86,8 +86,9 @@ public class GeneratorServiceImpl implements GeneratorService {
             Object[] arr = (Object[]) obj;
             tableInfos.add(new TableInfo(arr[0], arr[1], arr[2], arr[3], ObjectUtil.isNotEmpty(arr[4]) ? arr[4] : "-"));
         }
-        Query query1 = em.createNativeQuery("SELECT COUNT(*) from information_schema.tables where table_schema = (select database())");
-        Object totalElements = query1.getSingleResult();
+        Query totalQuery = em.createNativeQuery("SELECT COUNT(*) from information_schema.tables where table_schema = (select database()) and table_name like ? ");
+        totalQuery.setParameter(1, StringUtils.isNotBlank(name) ? ("%" + name + "%") : "%%");
+        Object totalElements = totalQuery.getSingleResult();
         return PageUtil.toPage(tableInfos, totalElements);
     }