From 123a564c39ba8c5e50854f66d3ced09f38b608ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=B4=E5=8D=AB?= <14240332@qq.com>
Date: Thu, 16 Mar 2023 16:03:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E9=80=89=E6=8B=A9=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=85=B3=E9=94=AE=E8=AF=8D=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf/base/service/impl/DataInterfaceServiceImpl.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/SC-boot/linkage-system/src/main/java/jnpf/base/service/impl/DataInterfaceServiceImpl.java b/SC-boot/linkage-system/src/main/java/jnpf/base/service/impl/DataInterfaceServiceImpl.java
index e3b42f1e..4b66e3c9 100644
--- a/SC-boot/linkage-system/src/main/java/jnpf/base/service/impl/DataInterfaceServiceImpl.java
+++ b/SC-boot/linkage-system/src/main/java/jnpf/base/service/impl/DataInterfaceServiceImpl.java
@@ -201,10 +201,11 @@ public class DataInterfaceServiceImpl extends ServiceImpl<DataInterfaceMapper, D
                 }
                 total = dataList.size();
             }
-            dataList = PageUtil.getListPage((int) page.getCurrentPage(), (int) page.getPageSize(), dataList);
+            dataList = PageUtil.getListPage((int) page.getCurrentPage(), total , dataList);
         }
         if (StringUtil.isNotEmpty(page.getKeyword())) {
-            dataList = dataList.stream().filter(t -> page.getKeyword().equals(String.valueOf(t.get(page.getRelationField())))).collect(Collectors.toList());
+            //dataList = dataList.stream().filter(t -> page.getKeyword().equals(String.valueOf(t.get(page.getRelationField())))).collect(Collectors.toList());
+            dataList = dataList.stream().filter(t -> String.valueOf(t.get(page.getRelationField())).contains(page.getKeyword())).collect(Collectors.toList());
         }
         PaginationVO pagination = JsonUtil.getJsonToBean(page, PaginationVO.class);
         pagination.setTotal(total);