From 0b331796e23dcfc245fcbf9ca8dcccc9c2853259 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 20 六月 2024 10:10:15 +0800
Subject: [PATCH] !551 ♥️发布 5.2.0 正式版本 Merge pull request !551 from 疯狂的狮子Li/dev
---
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 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 2e62081..3889250 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
@@ -50,49 +50,54 @@
* 鎵归噺鎻掑叆
*/
default boolean insertBatch(Collection<T> entityList) {
- return Db.saveBatch(entityList);
+ Db.saveBatch(entityList);
+ // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
+ return true;
}
/**
* 鎵归噺鏇存柊
*/
default boolean updateBatchById(Collection<T> entityList) {
- return Db.updateBatchById(entityList);
+ Db.updateBatchById(entityList);
+ // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
+ return true;
}
/**
* 鎵归噺鎻掑叆鎴栨洿鏂�
*/
default boolean insertOrUpdateBatch(Collection<T> entityList) {
- return Db.saveOrUpdateBatch(entityList);
+ Db.saveOrUpdateBatch(entityList);
+ // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
+ return true;
}
/**
* 鎵归噺鎻掑叆(鍖呭惈闄愬埗鏉℃暟)
*/
default boolean insertBatch(Collection<T> entityList, int batchSize) {
- return Db.saveBatch(entityList, batchSize);
+ Db.saveBatch(entityList, batchSize);
+ // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
+ return true;
}
/**
* 鎵归噺鏇存柊(鍖呭惈闄愬埗鏉℃暟)
*/
default boolean updateBatchById(Collection<T> entityList, int batchSize) {
- return Db.updateBatchById(entityList, batchSize);
+ Db.updateBatchById(entityList, batchSize);
+ // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
+ return true;
}
/**
* 鎵归噺鎻掑叆鎴栨洿鏂�(鍖呭惈闄愬埗鏉℃暟)
*/
default boolean insertOrUpdateBatch(Collection<T> entityList, int batchSize) {
- return Db.saveOrUpdateBatch(entityList, batchSize);
- }
-
- /**
- * 鎻掑叆鎴栨洿鏂�(鍖呭惈闄愬埗鏉℃暟)
- */
- default boolean insertOrUpdate(T entity) {
- return Db.saveOrUpdate(entity);
+ Db.saveOrUpdateBatch(entityList, batchSize);
+ // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
+ return true;
}
default V selectVoById(Serializable id) {
@@ -144,11 +149,22 @@
return selectVoOne(wrapper, this.currentVoClass());
}
+ default V selectVoOne(Wrapper<T> wrapper, boolean throwEx) {
+ return selectVoOne(wrapper, this.currentVoClass(), throwEx);
+ }
+
/**
* 鏍规嵁 entity 鏉′欢锛屾煡璇竴鏉¤褰�
*/
default <C> C selectVoOne(Wrapper<T> wrapper, Class<C> voClass) {
- T obj = this.selectOne(wrapper);
+ return selectVoOne(wrapper, voClass, true);
+ }
+
+ /**
+ * 鏍规嵁 entity 鏉′欢锛屾煡璇竴鏉¤褰�
+ */
+ default <C> C selectVoOne(Wrapper<T> wrapper, Class<C> voClass, boolean throwEx) {
+ T obj = this.selectOne(wrapper, throwEx);
if (ObjectUtil.isNull(obj)) {
return null;
}
--
Gitblit v1.9.3