修改新增方法名称.

nieqiurong · nieqiurong · commit c379b6470eae · 2024-06-08T23:01:11.000+08:00
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
@@ -440,7 +440,7 @@ default <P extends IPage<Map<String, Object>>> P selectMapsPage(P page, @Param(C
      * @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
@@ -201,7 +201,7 @@ protected String getSqlStatement(SqlMethod sqlMethod) {
      */
     @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
@@ -227,7 +227,7 @@ public static <T> boolean saveOrUpdate(T entity) {
         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
@@ -538,11 +538,11 @@ void testUpdateByWrapper() {
     @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());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ protected String getSqlStatement(SqlMethod sqlMethod) {`
`201`	`201`	`*/`
`202`	`202`	`@Override`
`203`	`203`	`public boolean saveOrUpdate(T entity) {`
`204`		`- return getBaseMapper().saveOrUpdate(entity);`
	`204`	`+ return getBaseMapper().insertOrUpdate(entity);`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`@Transactional(rollbackFor = Exception.class)`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ public static <T> boolean saveOrUpdate(T entity) {`
`227`	`227`	`if (Objects.isNull(entity)) {`
`228`	`228`	`return false;`
`229`	`229`	`}`
`230`		`- return SqlHelper.execute(getEntityClass(entity), baseMapper -> baseMapper.saveOrUpdate(entity));`
	`230`	`+ return SqlHelper.execute(getEntityClass(entity), baseMapper -> baseMapper.insertOrUpdate(entity));`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`/**`