|
|
@@ -473,9 +473,12 @@ public class AssetService {
|
|
|
|
|
|
List<UserHistory> content = map.getContent();
|
|
|
if (content!=null&&content.size()>0){
|
|
|
- List<UserHistory> nullList = new ArrayList();
|
|
|
- nullList.add(null);
|
|
|
- content.removeAll(nullList);
|
|
|
+ for (int i = 0; i < content.size(); i++) {
|
|
|
+ if (content.get(i)==null) {
|
|
|
+ content.remove(i);
|
|
|
+ i--;
|
|
|
+ }
|
|
|
+ }
|
|
|
Pageable pageable = PageRequest.of(pageQuery.getPage() - 1, pageQuery.getSize());
|
|
|
map = PageUtil.createPageFromList(content, pageable);
|
|
|
}
|