|
|
|
@ -199,11 +199,9 @@ public class DataInterfaceServiceImpl extends ServiceImpl<DataInterfaceMapper, D
|
|
|
|
|
if (page.getExcludeFields() != null && page.getExcludeFields().size() > 0) {
|
|
|
|
|
dataList = dataList.stream().filter(datas -> !(page.getExcludeFields().contains(datas.get("license_num")))).collect(Collectors.toList());
|
|
|
|
|
}
|
|
|
|
|
total = dataList.size();
|
|
|
|
|
}
|
|
|
|
|
//modified by 巴卫
|
|
|
|
|
//dataList = PageUtil.getListPage((int) page.getCurrentPage(), total , dataList);
|
|
|
|
|
//dataList = PageUtil.getListPage((int) page.getCurrentPage(), (int) page.getPageSize(), dataList);
|
|
|
|
|
/* modified by 巴卫 */
|
|
|
|
|
// dataList = PageUtil.getListPage((int) page.getCurrentPage(), (int) page.getPageSize(), dataList);
|
|
|
|
|
}
|
|
|
|
|
// if (StringUtil.isNotEmpty(page.getRelationField())) {
|
|
|
|
|
// //dataList = dataList.stream().filter(t -> page.getKeyword().equals(String.valueOf(t.get(page.getRelationField())))).collect(Collectors.toList());
|
|
|
|
|