关键词模糊查询优化。

SC-boot/linkage-system/src/main/java/jnpf/base/service/impl/DataInterfaceServiceImpl.java

@@ -205,12 +205,11 @@ public class DataInterfaceServiceImpl extends ServiceImpl<DataInterfaceMapper, D
             //dataList = PageUtil.getListPage((int) page.getCurrentPage(), total , dataList);
             //dataList = PageUtil.getListPage((int) page.getCurrentPage(), (int) page.getPageSize(), 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 -> String.valueOf(t.get(page.getRelationField())).contains(page.getKeyword())).collect(Collectors.toList());
-        }
-        PaginationVO pagination = new PaginationVO();
-        page.setTotal(dataList.size());
+//        if (StringUtil.isNotEmpty(page.getRelationField())) {
+//            //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());
+//        }
+
         if (StringUtil.isNotEmpty(page.getKeyword()) && StringUtil.isNotEmpty(page.getColumnOptions())) {
             String[] colOptions = page.getColumnOptions().split(",");
             dataList = dataList.stream().filter(t -> {
@@ -225,10 +224,12 @@ public class DataInterfaceServiceImpl extends ServiceImpl<DataInterfaceMapper, D
                     }
             ).collect(Collectors.toList());
         }
+        PaginationVO pagination = new PaginationVO();
+        page.setTotal(dataList.size());
+
         dataList = PageUtil.getListPage((int) page.getCurrentPage(), (int) page.getPageSize(), dataList);
         pagination = JsonUtil.getJsonToBean(page, PaginationVO.class);
-        //PaginationVO pagination = JsonUtil.getJsonToBean(page, PaginationVO.class);
-        //pagination.setTotal(total);
+
         return ActionResult.page(dataList, pagination, dataProcessing);
     }
 
@@ -486,7 +487,6 @@ public class DataInterfaceServiceImpl extends ServiceImpl<DataInterfaceMapper, D
     }
 
 
-
     /**
      * 执行SQL
      *