diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index 538472c4..5ce3f58b 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -256,7 +256,14 @@ public class ResourceServiceImpl extends CrudServiceImpl recordLists = resourceDTOS.stream() - .skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); + .skip((pageNum - 1) * pageSize).limit(pageSize) + .map(dto_ -> { + ResourceDTO temp = dto_; + this.get(dto_.getId()); + BeanUtils.copyProperties(temp, dto_); + dto_.setInfoList(temp.getInfoList()); + return dto_; + }).collect(Collectors.toList()); resultPage.setRecords(recordLists); resultPage.setTotal(resourceDTOS.size()); } @@ -319,10 +326,15 @@ public class ResourceServiceImpl extends CrudServiceImpl recordLists = new ArrayList<>(); - for (int i = (pageNum - 1) * pageSize; i < j; i++) { - recordLists.add(resourceDTOS.get(i)); - } + List recordLists = resourceDTOS.stream() + .skip((pageNum - 1) * pageSize).limit(pageSize) + .map(dto_ -> { + ResourceDTO temp = dto_; + this.get(dto_.getId()); + BeanUtils.copyProperties(temp, dto_); + dto_.setInfoList(temp.getInfoList()); + return dto_; + }).collect(Collectors.toList()); resultPage.setRecords(recordLists); resultPage.setTotal(resourceDTOS.size()); } diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index afb2f9fd..eb444391 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -106,35 +106,6 @@