|
|
|
@ -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);
|
|
|
|
|