From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java | 34 ++++++++++------------------------
1 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java
index 956be9f..24557ed 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java
@@ -18,9 +18,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.function.Function;
-import java.util.stream.Collectors;
/**
* 鑷畾涔� Mapper 鎺ュ彛, 瀹炵幇 鑷畾涔夋墿灞�
@@ -69,9 +67,7 @@
* @return 鎻掑叆鎿嶄綔鏄惁鎴愬姛鐨勫竷灏斿��
*/
default boolean insertBatch(Collection<T> entityList) {
- Db.saveBatch(entityList);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.saveBatch(entityList);
}
/**
@@ -81,9 +77,7 @@
* @return 鏇存柊鎿嶄綔鏄惁鎴愬姛鐨勫竷灏斿��
*/
default boolean updateBatchById(Collection<T> entityList) {
- Db.updateBatchById(entityList);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.updateBatchById(entityList);
}
/**
@@ -93,9 +87,7 @@
* @return 鎻掑叆鎴栨洿鏂版搷浣滄槸鍚︽垚鍔熺殑甯冨皵鍊�
*/
default boolean insertOrUpdateBatch(Collection<T> entityList) {
- Db.saveOrUpdateBatch(entityList);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.saveOrUpdateBatch(entityList);
}
/**
@@ -106,9 +98,7 @@
* @return 鎻掑叆鎿嶄綔鏄惁鎴愬姛鐨勫竷灏斿��
*/
default boolean insertBatch(Collection<T> entityList, int batchSize) {
- Db.saveBatch(entityList, batchSize);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.saveBatch(entityList, batchSize);
}
/**
@@ -119,9 +109,7 @@
* @return 鏇存柊鎿嶄綔鏄惁鎴愬姛鐨勫竷灏斿��
*/
default boolean updateBatchById(Collection<T> entityList, int batchSize) {
- Db.updateBatchById(entityList, batchSize);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.updateBatchById(entityList, batchSize);
}
/**
@@ -132,9 +120,7 @@
* @return 鎻掑叆鎴栨洿鏂版搷浣滄槸鍚︽垚鍔熺殑甯冨皵鍊�
*/
default boolean insertOrUpdateBatch(Collection<T> entityList, int batchSize) {
- Db.saveOrUpdateBatch(entityList, batchSize);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.saveOrUpdateBatch(entityList, batchSize);
}
/**
@@ -169,8 +155,8 @@
* @param idList 涓婚敭ID闆嗗悎
* @return 鏌ヨ鍒扮殑VO瀵硅薄鍒楄〃
*/
- default List<V> selectVoBatchIds(Collection<? extends Serializable> idList) {
- return selectVoBatchIds(idList, this.currentVoClass());
+ default List<V> selectVoByIds(Collection<? extends Serializable> idList) {
+ return selectVoByIds(idList, this.currentVoClass());
}
/**
@@ -181,8 +167,8 @@
* @param <C> VO绫荤殑绫诲瀷
* @return 鏌ヨ鍒扮殑VO瀵硅薄鍒楄〃锛岀粡杩囪浆鎹负鎸囧畾鐨刅O绫诲悗杩斿洖
*/
- default <C> List<C> selectVoBatchIds(Collection<? extends Serializable> idList, Class<C> voClass) {
- List<T> list = this.selectBatchIds(idList);
+ default <C> List<C> selectVoByIds(Collection<? extends Serializable> idList, Class<C> voClass) {
+ List<T> list = this.selectByIds(idList);
if (CollUtil.isEmpty(list)) {
return CollUtil.newArrayList();
}
--
Gitblit v1.9.3