From bdfd2f0787b0a39fb65793a7f57c95f5de09edf4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 30 八月 2021 12:49:19 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
index 4bef159..543d097 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.common.core.mybatisplus.core;
import cn.hutool.core.bean.copier.CopyOptions;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.TableInfo;
@@ -126,6 +127,9 @@
*/
@Override
public boolean saveAll(Collection<T> entityList) {
+ if (CollUtil.isEmpty(entityList)) {
+ return false;
+ }
return baseMapper.insertAll(entityList) == entityList.size();
}
@@ -134,6 +138,9 @@
*/
@Override
public boolean saveOrUpdateAll(Collection<T> entityList) {
+ if (CollUtil.isEmpty(entityList)) {
+ return false;
+ }
TableInfo tableInfo = TableInfoHelper.getTableInfo(entityClass);
Assert.notNull(tableInfo, "error: can not execute. because can not find cache of TableInfo for entity!");
String keyProperty = tableInfo.getKeyProperty();
@@ -149,10 +156,12 @@
updateList.add(entity);
}
}
- if (updateBatchById(updateList)) {
+ if (CollUtil.isNotEmpty(updateList) && updateBatchById(updateList)) {
row += updateList.size();
}
- row += baseMapper.insertAll(addList);
+ if (CollUtil.isNotEmpty(addList)) {
+ row += baseMapper.insertAll(addList);
+ }
return row == entityList.size();
}
--
Gitblit v1.9.3