diff --git a/SC-boot/linkage-system/src/main/java/jnpf/base/model/dataInterface/DataInterfacePage.java b/SC-boot/linkage-system/src/main/java/jnpf/base/model/dataInterface/DataInterfacePage.java
index cbf73721..2dcfe435 100644
--- a/SC-boot/linkage-system/src/main/java/jnpf/base/model/dataInterface/DataInterfacePage.java
+++ b/SC-boot/linkage-system/src/main/java/jnpf/base/model/dataInterface/DataInterfacePage.java
@@ -28,4 +28,10 @@ public class DataInterfacePage extends Pagination {
 
     private List<String> excludeFields;
 
+    //查询字段（多个）
+    private String columnOptions;
+
+    private Object ids;
+
+    private List<DataInterfaceModel> paramList;
 }
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 4b66e3c9..50f641a0 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,14 +201,34 @@ public class DataInterfaceServiceImpl extends ServiceImpl<DataInterfaceMapper, D
                 }
                 total = dataList.size();
             }
-            dataList = PageUtil.getListPage((int) page.getCurrentPage(), total , dataList);
+            //modified by 巴卫
+            //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 = JsonUtil.getJsonToBean(page, PaginationVO.class);
-        pagination.setTotal(total);
+        PaginationVO pagination = new PaginationVO();
+        page.setTotal(dataList.size());
+        if (StringUtil.isNotEmpty(page.getKeyword()) && StringUtil.isNotEmpty(page.getColumnOptions())) {
+            String[] colOptions = page.getColumnOptions().split(",");
+            dataList = dataList.stream().filter(t ->{
+                        boolean isFit = false;
+                        for (String c : colOptions){
+                            if (String.valueOf(t.get(c)).contains(page.getKeyword())){
+                                isFit = true;
+                                break;
+                            }
+                        }
+                        return isFit;
+                    }
+            ).collect(Collectors.toList());
+        }
+        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);
     }