From da5a1293b3f40ab176629a7fb2bb5901bf9ae4af Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 26 七月 2021 13:12:03 +0800
Subject: [PATCH] update 更新自定义vo转化接口

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
index e2d9a3d..069c6a7 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
@@ -20,7 +20,11 @@
  */
 public interface IServicePlus<T, K> extends IService<T> {
 
-	K getVoById(Serializable id, CopyOptions copyOptions);
+	K getVoById(Serializable id, CopyOptions copyOptions, Class<K> kClass);
+
+	default K getVoById(Serializable id, CopyOptions copyOptions) {
+		return getVoById(id, copyOptions, null);
+	}
 
 	default K getVoById(Serializable id) {
 		return getVoById(id, new CopyOptions());
@@ -30,7 +34,11 @@
 		return convertor.apply(getById(id));
 	}
 
-	List<K> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions);
+	List<K> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions, Class<K> kClass);
+
+	default List<K> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions) {
+		return listVoByIds(idList, copyOptions, null);
+	}
 
 	default List<K> listVoByIds(Collection<? extends Serializable> idList) {
 		return listVoByIds(idList, new CopyOptions());
@@ -45,7 +53,11 @@
 		return convertor.apply(list);
 	}
 
-	List<K> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions);
+	List<K> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions, Class<K> kClass);
+
+	default List<K> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions) {
+		return listVoByMap(columnMap, copyOptions, null);
+	}
 
 	default List<K> listVoByMap(Map<String, Object> columnMap) {
 		return listVoByMap(columnMap, new CopyOptions());
@@ -61,7 +73,11 @@
 		return convertor.apply(list);
 	}
 
-	K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions);
+	K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions, Class<K> kClass);
+
+	default K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
+		return getVoOne(queryWrapper, copyOptions, null);
+	}
 
 	default K getVoOne(Wrapper<T> queryWrapper) {
 		return getVoOne(queryWrapper, new CopyOptions());
@@ -71,7 +87,11 @@
 		return convertor.apply(getOne(queryWrapper, true));
 	}
 
-	List<K> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions);
+	List<K> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions, Class<K> kClass);
+
+	default List<K> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
+		return listVo(queryWrapper, copyOptions, null);
+	}
 
 	default List<K> listVo(Wrapper<T> queryWrapper) {
 		return listVo(queryWrapper, new CopyOptions());
@@ -93,7 +113,11 @@
 		return listVo(Wrappers.emptyWrapper(), convertor);
 	}
 
-	PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, CopyOptions copyOptions);
+	PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, CopyOptions copyOptions, Class<K> kClass);
+
+	default PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, CopyOptions copyOptions) {
+		return pageVo(page, queryWrapper, copyOptions, null);
+	}
 
 	default PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper) {
 		return pageVo(page, queryWrapper, new CopyOptions());

--
Gitblit v1.9.3