From 5b4e9ef4dbdc8f2170afbde09be96c21bb9766e1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 22 四月 2021 09:50:03 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev
---
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm | 15 +++++++++++++--
1 files changed, 13 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..cbf9d32 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
import ${packageName}.bo.${ClassName}AddBo;
import ${packageName}.bo.${ClassName}QueryBo;
import ${packageName}.bo.${ClassName}EditBo;
@@ -31,7 +32,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
@@ -53,6 +54,8 @@
#end
lqw.$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName());
#else
+ Object dataScope = bo.getParams().get("dataScope");
+ lqw.apply(dataScope != null, dataScope != null ? dataScope.toString() : null);
Map<String, Object> params = bo.getParams();
if (params.get("begin$AttrName") != null && params.get("end$AttrName") != null) {
lqw.between(${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName"));
@@ -70,9 +73,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