From c1964b934fc9b388cd73401c50aa569de800be52 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 31 三月 2021 16:51:24 +0800
Subject: [PATCH] update 简化queryById代码生成器
---
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
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 cacc204..7d44eaa 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -31,7 +31,7 @@
@Override
public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){
${ClassName} db = this.baseMapper.selectById(${pkColumn.javaField});
- return entity2Vo(Collections.singletonList(db)).get(0);
+ return BeanUtil.toBean(db, ${ClassName}Vo.class)
}
@Override
@@ -70,9 +70,17 @@
* @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
--
Gitblit v1.9.3