From 77ffdf69a1c09553f450d3293ab0b07848b90ca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Thu, 25 Mar 2021 17:01:17 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20vo=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=20=E5=88=86=E9=A1=B5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/java/serviceImpl.java.vm     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index cacc204d..52c2db84 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/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