!240 #I4XSL0 issues 的处理

Merge pull request !240 from 深呼吸丶/3.0

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/AbstractMethod.java

@@ -60,15 +60,6 @@ public abstract class AbstractMethod implements Constants {
      */
     protected final String methodName;
 
-    /**
-     * @see AbstractMethod#AbstractMethod(java.lang.String)
-     * @since 3.5.0
-     */
-    @Deprecated
-    public AbstractMethod() {
-        methodName = null;
-    }
-
     /**
      * @param methodName 方法名
      * @since 3.5.0
@@ -441,19 +432,6 @@ public abstract class AbstractMethod implements Constants {
      * @return MappedStatement
      */
     public abstract MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> modelClass, TableInfo tableInfo);
-
-    /**
-     * 获取自定义方法名，未设置采用默认方法名
-     * https://gitee.com/baomidou/mybatis-plus/pulls/88
-     *
-     * @return method
-     * @author 义陆无忧
-     * @see AbstractMethod#AbstractMethod(java.lang.String)
-     * @deprecated 3.5.0
-     */
-    @Deprecated
-    public String getMethod(SqlMethod sqlMethod) {
-        return StringUtils.isBlank(methodName) ? sqlMethod.getMethod() : this.methodName;
-    }
+    
 
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/Delete.java

@@ -30,7 +30,7 @@ import org.apache.ibatis.mapping.SqlSource;
 public class Delete extends AbstractMethod {
 
     public Delete() {
-        super("delete");
+        this(SqlMethod.DELETE.getMethod());
     }
 
     /**
@@ -50,14 +50,14 @@ public class Delete extends AbstractMethod {
                 sqlWhereEntityWrapper(true, tableInfo),
                 sqlComment());
             SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-            return addUpdateMappedStatement(mapperClass, modelClass, getMethod(sqlMethod), sqlSource);
+            return addUpdateMappedStatement(mapperClass, modelClass, methodName, sqlSource);
         } else {
             sqlMethod = SqlMethod.DELETE;
             sql = String.format(sqlMethod.getSql(), tableInfo.getTableName(),
                 sqlWhereEntityWrapper(true, tableInfo),
                 sqlComment());
             SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-            return this.addDeleteMappedStatement(mapperClass, getMethod(sqlMethod), sqlSource);
+            return this.addDeleteMappedStatement(mapperClass, methodName, sqlSource);
         }
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/DeleteBatchByIds.java

@@ -31,7 +31,7 @@ import org.apache.ibatis.mapping.SqlSource;
 public class DeleteBatchByIds extends AbstractMethod {
 
     public DeleteBatchByIds() {
-        super("deleteBatchIds");
+        this(SqlMethod.DELETE_BATCH_BY_IDS.getMethod());
     }
 
     /**
@@ -49,7 +49,7 @@ public class DeleteBatchByIds extends AbstractMethod {
         if (tableInfo.isWithLogicDelete()) {
             sql = logicDeleteScript(tableInfo, sqlMethod);
             SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, Object.class);
-            return addUpdateMappedStatement(mapperClass, modelClass, getMethod(sqlMethod), sqlSource);
+            return addUpdateMappedStatement(mapperClass, modelClass, methodName, sqlSource);
         } else {
             sqlMethod = SqlMethod.DELETE_BATCH_BY_IDS;
             sql = String.format(sqlMethod.getSql(), tableInfo.getTableName(), tableInfo.getKeyColumn(),
@@ -58,7 +58,7 @@ public class DeleteBatchByIds extends AbstractMethod {
                         "#{item}", "#{item." + tableInfo.getKeyProperty() + "}"),
                     COLL, null, "item", COMMA));
             SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, Object.class);
-            return this.addDeleteMappedStatement(mapperClass, getMethod(sqlMethod), sqlSource);
+            return this.addDeleteMappedStatement(mapperClass, methodName, sqlSource);
         }
     }
 

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/DeleteById.java

@@ -38,7 +38,7 @@ import static java.util.stream.Collectors.toList;
 public class DeleteById extends AbstractMethod {
 
     public DeleteById() {
-        super("deleteById");
+        this(SqlMethod.DELETE_BY_ID.getMethod());
     }
 
     /**
@@ -70,13 +70,13 @@ public class DeleteById extends AbstractMethod {
                     tableInfo.getLogicDeleteSql(true, true));
             }
             SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, Object.class);
-            return addUpdateMappedStatement(mapperClass, modelClass, getMethod(sqlMethod), sqlSource);
+            return addUpdateMappedStatement(mapperClass, modelClass, methodName, sqlSource);
         } else {
             sqlMethod = SqlMethod.DELETE_BY_ID;
             sql = String.format(sqlMethod.getSql(), tableInfo.getTableName(), tableInfo.getKeyColumn(),
                 tableInfo.getKeyProperty());
             SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, Object.class);
-            return this.addDeleteMappedStatement(mapperClass, getMethod(sqlMethod), sqlSource);
+            return this.addDeleteMappedStatement(mapperClass, methodName, sqlSource);
         }
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/DeleteByMap.java

@@ -32,7 +32,7 @@ import java.util.Map;
 public class DeleteByMap extends AbstractMethod {
 
     public DeleteByMap() {
-        super("deleteByMap");
+        this(SqlMethod.DELETE_BY_MAP.getMethod());
     }
 
     /**
@@ -50,12 +50,12 @@ public class DeleteByMap extends AbstractMethod {
         if (tableInfo.isWithLogicDelete()) {
             sql = String.format(sqlMethod.getSql(), tableInfo.getTableName(), sqlLogicSet(tableInfo), sqlWhereByMap(tableInfo));
             SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, Map.class);
-            return addUpdateMappedStatement(mapperClass, Map.class, getMethod(sqlMethod), sqlSource);
+            return addUpdateMappedStatement(mapperClass, Map.class, methodName, sqlSource);
         } else {
             sqlMethod = SqlMethod.DELETE_BY_MAP;
             sql = String.format(sqlMethod.getSql(), tableInfo.getTableName(), this.sqlWhereByMap(tableInfo));
             SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, Map.class);
-            return this.addDeleteMappedStatement(mapperClass, getMethod(sqlMethod), sqlSource);
+            return this.addDeleteMappedStatement(mapperClass, methodName, sqlSource);
         }
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/Insert.java

@@ -37,7 +37,7 @@ import org.apache.ibatis.mapping.SqlSource;
 public class Insert extends AbstractMethod {
 
     public Insert() {
-        super(SqlMethod.INSERT_ONE.getMethod());
+        this(SqlMethod.INSERT_ONE.getMethod());
     }
 
     /**
@@ -66,13 +66,13 @@ public class Insert extends AbstractMethod {
                 keyProperty = tableInfo.getKeyProperty();
                 keyColumn = tableInfo.getKeyColumn();
             } else if (null != tableInfo.getKeySequence()) {
-                keyGenerator = TableInfoHelper.genKeyGenerator(this.methodName, tableInfo, builderAssistant);
+                keyGenerator = TableInfoHelper.genKeyGenerator(methodName, tableInfo, builderAssistant);
                 keyProperty = tableInfo.getKeyProperty();
                 keyColumn = tableInfo.getKeyColumn();
             }
         }
         String sql = String.format(sqlMethod.getSql(), tableInfo.getTableName(), columnScript, valuesScript);
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-        return this.addInsertMappedStatement(mapperClass, modelClass, getMethod(sqlMethod), sqlSource, keyGenerator, keyProperty, keyColumn);
+        return this.addInsertMappedStatement(mapperClass, modelClass, methodName, sqlSource, keyGenerator, keyProperty, keyColumn);
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectBatchByIds.java

@@ -31,7 +31,7 @@ import org.apache.ibatis.mapping.SqlSource;
 public class SelectBatchByIds extends AbstractMethod {
 
     public SelectBatchByIds() {
-        super(SqlMethod.SELECT_BATCH_BY_IDS.getMethod());
+        this(SqlMethod.SELECT_BATCH_BY_IDS.getMethod());
     }
 
     /**
@@ -49,6 +49,6 @@ public class SelectBatchByIds extends AbstractMethod {
                 sqlSelectColumns(tableInfo, false), tableInfo.getTableName(), tableInfo.getKeyColumn(),
                 SqlScriptUtils.convertForeach("#{item}", COLL, null, "item", COMMA),
                 tableInfo.getLogicDeleteSql(true, true)), Object.class);
-        return addSelectMappedStatementForTable(mapperClass, getMethod(sqlMethod), sqlSource, tableInfo);
+        return addSelectMappedStatementForTable(mapperClass, methodName, sqlSource, tableInfo);
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectById.java

@@ -31,7 +31,7 @@ import org.apache.ibatis.scripting.defaults.RawSqlSource;
 public class SelectById extends AbstractMethod {
 
     public SelectById() {
-        super(SqlMethod.SELECT_BY_ID.getMethod());
+        this(SqlMethod.SELECT_BY_ID.getMethod());
     }
 
     /**
@@ -49,6 +49,6 @@ public class SelectById extends AbstractMethod {
                 sqlSelectColumns(tableInfo, false),
                 tableInfo.getTableName(), tableInfo.getKeyColumn(), tableInfo.getKeyProperty(),
                 tableInfo.getLogicDeleteSql(true, true)), Object.class);
-        return this.addSelectMappedStatementForTable(mapperClass, getMethod(sqlMethod), sqlSource, tableInfo);
+        return this.addSelectMappedStatementForTable(mapperClass, methodName, sqlSource, tableInfo);
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectByMap.java

@@ -32,7 +32,7 @@ import java.util.Map;
 public class SelectByMap extends AbstractMethod {
 
     public SelectByMap() {
-        super(SqlMethod.SELECT_BY_MAP.getMethod());
+        this(SqlMethod.SELECT_BY_MAP.getMethod());
     }
 
     /**
@@ -49,6 +49,6 @@ public class SelectByMap extends AbstractMethod {
         String sql = String.format(sqlMethod.getSql(), sqlSelectColumns(tableInfo, false),
             tableInfo.getTableName(), sqlWhereByMap(tableInfo));
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, Map.class);
-        return this.addSelectMappedStatementForTable(mapperClass, getMethod(sqlMethod), sqlSource, tableInfo);
+        return this.addSelectMappedStatementForTable(mapperClass, methodName, sqlSource, tableInfo);
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectCount.java

@@ -30,7 +30,7 @@ import org.apache.ibatis.mapping.SqlSource;
 public class SelectCount extends AbstractMethod {
 
     public SelectCount() {
-        super(SqlMethod.SELECT_COUNT.getMethod());
+        this(SqlMethod.SELECT_COUNT.getMethod());
     }
 
     /**
@@ -47,6 +47,6 @@ public class SelectCount extends AbstractMethod {
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlCount(), tableInfo.getTableName(),
             sqlWhereEntityWrapper(true, tableInfo), sqlComment());
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-        return this.addSelectMappedStatementForOther(mapperClass, getMethod(sqlMethod), sqlSource, Long.class);
+        return this.addSelectMappedStatementForOther(mapperClass, methodName, sqlSource, Long.class);
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectList.java

@@ -30,7 +30,7 @@ import org.apache.ibatis.mapping.SqlSource;
 public class SelectList extends AbstractMethod {
 
     public SelectList() {
-        super(SqlMethod.SELECT_LIST.getMethod());
+        this(SqlMethod.SELECT_LIST.getMethod());
     }
 
     /**
@@ -47,6 +47,6 @@ public class SelectList extends AbstractMethod {
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlSelectColumns(tableInfo, true), tableInfo.getTableName(),
             sqlWhereEntityWrapper(true, tableInfo), sqlOrderBy(tableInfo), sqlComment());
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-        return this.addSelectMappedStatementForTable(mapperClass, getMethod(sqlMethod), sqlSource, tableInfo);
+        return this.addSelectMappedStatementForTable(mapperClass, methodName, sqlSource, tableInfo);
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectMaps.java

@@ -32,7 +32,7 @@ import java.util.Map;
 public class SelectMaps extends AbstractMethod {
 
     public SelectMaps() {
-        super(SqlMethod.SELECT_MAPS.getMethod());
+        this(SqlMethod.SELECT_MAPS.getMethod());
     }
 
     /**
@@ -49,6 +49,6 @@ public class SelectMaps extends AbstractMethod {
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlSelectColumns(tableInfo, true), tableInfo.getTableName(),
             sqlWhereEntityWrapper(true, tableInfo),sqlOrderBy(tableInfo), sqlComment());
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-        return this.addSelectMappedStatementForOther(mapperClass, getMethod(sqlMethod), sqlSource, Map.class);
+        return this.addSelectMappedStatementForOther(mapperClass, methodName, sqlSource, Map.class);
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectMapsPage.java

@@ -32,7 +32,7 @@ import java.util.Map;
 public class SelectMapsPage extends AbstractMethod {
 
     public SelectMapsPage() {
-        super(SqlMethod.SELECT_MAPS_PAGE.getMethod());
+        this(SqlMethod.SELECT_MAPS_PAGE.getMethod());
     }
 
     /**
@@ -49,6 +49,6 @@ public class SelectMapsPage extends AbstractMethod {
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlSelectColumns(tableInfo, true),
             tableInfo.getTableName(), sqlWhereEntityWrapper(true, tableInfo), sqlOrderBy(tableInfo), sqlComment());
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-        return this.addSelectMappedStatementForOther(mapperClass, getMethod(sqlMethod), sqlSource, Map.class);
+        return this.addSelectMappedStatementForOther(mapperClass, methodName, sqlSource, Map.class);
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectObjs.java

@@ -30,7 +30,7 @@ import org.apache.ibatis.mapping.SqlSource;
 public class SelectObjs extends AbstractMethod {
 
     public SelectObjs() {
-        super(SqlMethod.SELECT_OBJS.getMethod());
+        this(SqlMethod.SELECT_OBJS.getMethod());
     }
 
     /**
@@ -47,6 +47,6 @@ public class SelectObjs extends AbstractMethod {
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlSelectObjsColumns(tableInfo),
             tableInfo.getTableName(), sqlWhereEntityWrapper(true, tableInfo),sqlOrderBy(tableInfo), sqlComment());
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-        return this.addSelectMappedStatementForOther(mapperClass, getMethod(sqlMethod), sqlSource, Object.class);
+        return this.addSelectMappedStatementForOther(mapperClass, methodName, sqlSource, Object.class);
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectOne.java

@@ -31,7 +31,7 @@ import org.apache.ibatis.mapping.SqlSource;
 public class SelectOne extends AbstractMethod {
 
     public SelectOne() {
-        super(SqlMethod.SELECT_ONE.getMethod());
+        this(SqlMethod.SELECT_ONE.getMethod());
     }
 
     /**
@@ -48,6 +48,6 @@ public class SelectOne extends AbstractMethod {
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, String.format(sqlMethod.getSql(),
             sqlFirst(), sqlSelectColumns(tableInfo, true), tableInfo.getTableName(),
             sqlWhereEntityWrapper(true, tableInfo), sqlComment()), modelClass);
-        return this.addSelectMappedStatementForTable(mapperClass, getMethod(sqlMethod), sqlSource, tableInfo);
+        return this.addSelectMappedStatementForTable(mapperClass, methodName, sqlSource, tableInfo);
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectPage.java

@@ -30,7 +30,7 @@ import org.apache.ibatis.mapping.SqlSource;
 public class SelectPage extends AbstractMethod {
 
     public SelectPage() {
-        super(SqlMethod.SELECT_PAGE.getMethod());
+        this(SqlMethod.SELECT_PAGE.getMethod());
     }
 
     /**
@@ -47,6 +47,6 @@ public class SelectPage extends AbstractMethod {
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlSelectColumns(tableInfo, true),
             tableInfo.getTableName(), sqlWhereEntityWrapper(true, tableInfo), sqlOrderBy(tableInfo), sqlComment());
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-        return this.addSelectMappedStatementForTable(mapperClass, getMethod(sqlMethod), sqlSource, tableInfo);
+        return this.addSelectMappedStatementForTable(mapperClass, methodName, sqlSource, tableInfo);
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/Update.java

@@ -30,7 +30,7 @@ import org.apache.ibatis.mapping.SqlSource;
 public class Update extends AbstractMethod {
 
     public Update() {
-        super(SqlMethod.UPDATE.getMethod());
+        this(SqlMethod.UPDATE.getMethod());
     }
 
     /**
@@ -48,6 +48,6 @@ public class Update extends AbstractMethod {
             sqlSet(true, true, tableInfo, true, ENTITY, ENTITY_DOT),
             sqlWhereEntityWrapper(true, tableInfo), sqlComment());
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-        return this.addUpdateMappedStatement(mapperClass, modelClass, getMethod(sqlMethod), sqlSource);
+        return this.addUpdateMappedStatement(mapperClass, modelClass, methodName, sqlSource);
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/UpdateById.java

@@ -30,7 +30,7 @@ import org.apache.ibatis.mapping.SqlSource;
 public class UpdateById extends AbstractMethod {
 
     public UpdateById() {
-        super(SqlMethod.UPDATE_BY_ID.getMethod());
+        this(SqlMethod.UPDATE_BY_ID.getMethod());
     }
 
     /**
@@ -49,6 +49,6 @@ public class UpdateById extends AbstractMethod {
             sqlSet(tableInfo.isWithLogicDelete(), false, tableInfo, false, ENTITY, ENTITY_DOT),
             tableInfo.getKeyColumn(), ENTITY_DOT + tableInfo.getKeyProperty(), additional);
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-        return addUpdateMappedStatement(mapperClass, modelClass, getMethod(sqlMethod), sqlSource);
+        return addUpdateMappedStatement(mapperClass, modelClass, methodName, sqlSource);
     }
 }

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/MethodTest.java

@@ -1,20 +1,24 @@
 package com.baomidou.mybatisplus.core;
 
-import com.baomidou.mybatisplus.core.enums.SqlMethod;
 import com.baomidou.mybatisplus.core.injector.AbstractMethod;
-import com.baomidou.mybatisplus.core.injector.methods.Insert;
+import com.baomidou.mybatisplus.core.injector.methods.*;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
 import org.apache.ibatis.mapping.MappedStatement;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+import java.util.stream.Stream;
+
+import static java.util.stream.Collectors.toList;
+
 public class MethodTest {
 
     static class TestMethod extends AbstractMethod {
 
-        public TestMethod() {
+        public TestMethod(){
+            this("TestMethod");
         }
-
         public TestMethod(String methodName) {
             super(methodName);
         }
@@ -24,20 +28,18 @@ public class MethodTest {
             return null;
         }
 
-        @Override
-        public String getMethod(SqlMethod sqlMethod) {
-            return "testMethod";
-        }
-
     }
 
     @Test
     void test(){
-        Assertions.assertEquals(new Insert().getMethod(SqlMethod.INSERT_ONE),"insert");
-        Assertions.assertEquals(new Insert("testInsert").getMethod(SqlMethod.INSERT_ONE),"testInsert");
-        Assertions.assertEquals(new TestMethod().getMethod(SqlMethod.INSERT_ONE),"testMethod");
-        //这里方法被复写了,用复写的方法为准
-        Assertions.assertEquals(new TestMethod("xxxx").getMethod(SqlMethod.INSERT_ONE),"testMethod");
+        Stream.Builder<AbstractMethod> builder = Stream.<AbstractMethod>builder()
+            .add(new Insert())
+            .add(new Delete())
+            .add(new Update())
+            .add(new SelectPage())
+            .add(new TestMethod());
+        List<AbstractMethod> collect = builder.build().collect(toList());
+        Assert.isTrue(collect.size() == 5, "创建失败！");
     }
 
 }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/injector/methods/AlwaysUpdateSomeColumnById.java

@@ -84,7 +84,7 @@ public class AlwaysUpdateSomeColumnById extends AbstractMethod {
         String sql = String.format(sqlMethod.getSql(), tableInfo.getTableName(), sqlSet,
             tableInfo.getKeyColumn(), ENTITY_DOT + tableInfo.getKeyProperty(), additional);
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-        return addUpdateMappedStatement(mapperClass, modelClass, getMethod(sqlMethod), sqlSource);
+        return addUpdateMappedStatement(mapperClass, modelClass, methodName, sqlSource);
     }
 
     private Predicate<TableFieldInfo> getPredicate() {

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/injector/methods/InsertBatchSomeColumn.java

@@ -128,7 +128,7 @@ public class InsertBatchSomeColumn extends AbstractMethod {
         }
         String sql = String.format(sqlMethod.getSql(), tableInfo.getTableName(), columnScript, valuesScript);
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-        return this.addInsertMappedStatement(mapperClass, modelClass, getMethod(sqlMethod), sqlSource, keyGenerator, keyProperty, keyColumn);
+        return this.addInsertMappedStatement(mapperClass, modelClass, methodName, sqlSource, keyGenerator, keyProperty, keyColumn);
     }
 
 }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/injector/methods/LogicDeleteByIdWithFill.java

@@ -83,7 +83,7 @@ public class LogicDeleteByIdWithFill extends AbstractMethod {
                 tableInfo.getKeyProperty());
         }
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-        return addUpdateMappedStatement(mapperClass, modelClass, getMethod(sqlMethod), sqlSource);
+        return addUpdateMappedStatement(mapperClass, modelClass, methodName, sqlSource);
     }
 
 }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/injector/methods/Upsert.java

@@ -67,6 +67,6 @@ public class Upsert extends AbstractMethod {
         }
         String sql = String.format(sqlMethod.getSql(), tableInfo.getTableName(), columnScript, valuesScript);
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-        return this.addInsertMappedStatement(mapperClass, modelClass, getMethod(sqlMethod), sqlSource, keyGenerator, keyProperty, keyColumn);
+        return this.addInsertMappedStatement(mapperClass, modelClass, methodName, sqlSource, keyGenerator, keyProperty, keyColumn);
     }
 }