瀏覽代碼

fix 修复 vo转换 分页bug

疯狂的狮子li 4 年之前
父節點
當前提交
77ffdf69a1
共有 1 個文件被更改,包括 9 次插入1 次删除
  1. 9 1
      ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

+ 9 - 1
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -70,9 +70,17 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
     * @return
     */
     private List<${ClassName}Vo> entity2Vo(Collection<${ClassName}> collection) {
-        return collection.stream()
+        List<${ClassName}Vo> voList = collection.stream()
                 .map(any -> BeanUtil.toBean(any, ${ClassName}Vo.class))
                 .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<${ClassName}> page = (Page<${ClassName}>)collection;
+            Page<${ClassName}Vo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
     }
 
     @Override