Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-08-02 cfdeada3fdb415ea451fb3fb76b96a2e7977752c

 ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java

@@ -2,7 +2,6 @@

import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.core.enums.SqlMethod;
import com.baomidou.mybatisplus.core.injector.AbstractMethod;
import com.baomidou.mybatisplus.core.metadata.TableInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
@@ -13,7 +12,7 @@
import org.apache.ibatis.mapping.SqlSource;

/**
 * 单sql批量插入
 * 单sql批量插入( 全量填充 无视数据库默认值 )
 *
 * @author Lion Li
 */
@@ -25,7 +24,7 @@
      final String fieldSql = prepareFieldSql(tableInfo);
      final String valueSql = prepareValuesSqlForMysqlBatch(tableInfo);
      KeyGenerator keyGenerator = new NoKeyGenerator();
      SqlMethod sqlMethod = SqlMethod.INSERT_ONE;
      String sqlMethod = "insertAll";
      String keyProperty = null;
      String keyColumn = null;
      // 表包含主键处理逻辑,如果不包含主键当普通字段处理
@@ -37,7 +36,7 @@
            keyColumn = tableInfo.getKeyColumn();
         } else {
            if (null != tableInfo.getKeySequence()) {
               keyGenerator = TableInfoHelper.genKeyGenerator(getMethod(sqlMethod), tableInfo, builderAssistant);
               keyGenerator = TableInfoHelper.genKeyGenerator(sqlMethod, tableInfo, builderAssistant);
               keyProperty = tableInfo.getKeyProperty();
               keyColumn = tableInfo.getKeyColumn();
            }
@@ -45,7 +44,7 @@
      }
      final String sqlResult = String.format(sql, tableInfo.getTableName(), fieldSql, valueSql);
      SqlSource sqlSource = languageDriver.createSqlSource(configuration, sqlResult, modelClass);
      return this.addInsertMappedStatement(mapperClass, modelClass, "insertAll", sqlSource, keyGenerator, keyProperty, keyColumn);
      return this.addInsertMappedStatement(mapperClass, modelClass, sqlMethod, sqlSource, keyGenerator, keyProperty, keyColumn);
   }

   private String prepareFieldSql(TableInfo tableInfo) {