diff --git a/mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/mapper/BaseMapper.java b/mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/mapper/BaseMapper.java index b5c2f6106..2614ef81c 100644 --- a/mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/mapper/BaseMapper.java +++ b/mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/mapper/BaseMapper.java @@ -440,7 +440,7 @@ public interface BaseMapper extends Mapper { * @param entity 实体对象 (不能为空) * @since 3.5.7 */ - default boolean saveOrUpdate(T entity) { + default boolean insertOrUpdate(T entity) { Class entityClass = GenericTypeUtils.resolveTypeArguments(getClass(), BaseMapper.class)[0]; TableInfo tableInfo = TableInfoHelper.getTableInfo(entityClass); Assert.notNull(tableInfo, "error: can not execute. because can not find cache of TableInfo for entity!"); diff --git a/mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/service/impl/ServiceImpl.java b/mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/service/impl/ServiceImpl.java index 81fe068d2..347fa2651 100644 --- a/mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/service/impl/ServiceImpl.java +++ b/mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/service/impl/ServiceImpl.java @@ -201,7 +201,7 @@ public abstract class ServiceImpl, T> implements IServic */ @Override public boolean saveOrUpdate(T entity) { - return getBaseMapper().saveOrUpdate(entity); + return getBaseMapper().insertOrUpdate(entity); } @Transactional(rollbackFor = Exception.class) diff --git a/mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/Db.java b/mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/Db.java index c8e38e3b1..dc82b96c6 100644 --- a/mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/Db.java +++ b/mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/Db.java @@ -227,7 +227,7 @@ public class Db { if (Objects.isNull(entity)) { return false; } - return SqlHelper.execute(getEntityClass(entity), baseMapper -> baseMapper.saveOrUpdate(entity)); + return SqlHelper.execute(getEntityClass(entity), baseMapper -> baseMapper.insertOrUpdate(entity)); } /** diff --git a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserMapperTest.java b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserMapperTest.java index 953d5f017..3e3d08a4f 100644 --- a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserMapperTest.java +++ b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserMapperTest.java @@ -538,11 +538,11 @@ class H2UserMapperTest extends BaseTest { @Test void testSaveOrUpdate() { var h2User = new H2User(); - userMapper.saveOrUpdate(h2User); + userMapper.insertOrUpdate(h2User); Assertions.assertNotNull(h2User.getTestId()); Assertions.assertNull(h2User.getLastUpdatedDt()); h2User.setName("test"); - userMapper.saveOrUpdate(h2User); + userMapper.insertOrUpdate(h2User); Assertions.assertNotNull(h2User.getLastUpdatedDt()); }