fixed gitee issues/IHUIJ

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/engine/AbstractTemplateEngine.java

@@ -77,6 +77,20 @@ public abstract class AbstractTemplateEngine {
                 Map<String, Object> objectMap = this.getObjectMap(tableInfo);
                 Map<String, String> pathInfo = this.getConfigBuilder().getPathInfo();
                 TemplateConfig template = this.getConfigBuilder().getTemplate();
+                // 自定义内容
+                InjectionConfig injectionConfig = this.getConfigBuilder().getInjectionConfig();
+                if (null != injectionConfig) {
+                    injectionConfig.initMap();
+                    objectMap.put("cfg" , injectionConfig.getMap());
+                    List<FileOutConfig> focList = injectionConfig.getFileOutConfigList();
+                    if (CollectionUtils.isNotEmpty(focList)) {
+                        for (FileOutConfig foc : focList) {
+                            if (this.isCreate(foc.outputFile(tableInfo))) {
+                                this.writer(objectMap, foc.getTemplatePath(), foc.outputFile(tableInfo));
+                            }
+                        }
+                    }
+                }
                 // Mp.java
                 String entityName = tableInfo.getEntityName();
                 if (null != entityName) {
@@ -120,20 +134,6 @@ public abstract class AbstractTemplateEngine {
                         this.writer(objectMap, this.templateFilePath(template.getController()), controllerFile);
                     }
                 }
-                // 自定义内容
-                InjectionConfig injectionConfig = this.getConfigBuilder().getInjectionConfig();
-                if (null != injectionConfig) {
-                    injectionConfig.initMap();
-                    objectMap.put("cfg" , injectionConfig.getMap());
-                    List<FileOutConfig> focList = injectionConfig.getFileOutConfigList();
-                    if (CollectionUtils.isNotEmpty(focList)) {
-                        for (FileOutConfig foc : focList) {
-                            if (this.isCreate(foc.outputFile(tableInfo))) {
-                                this.writer(objectMap, foc.getTemplatePath(), foc.outputFile(tableInfo));
-                            }
-                        }
-                    }
-                }
             }
         } catch (Exception e) {
             logger.error("无法创建文件，请检查配置信息！" , e);

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/PostgreSQLGenerator.java

@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Scanner;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
 import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.generator.config.GlobalConfig;
 import com.baomidou.mybatisplus.generator.config.PackageConfig;
 import com.baomidou.mybatisplus.generator.config.StrategyConfig;
 import com.baomidou.mybatisplus.generator.config.converts.OracleTypeConvert;
+import com.baomidou.mybatisplus.generator.config.po.TableFill;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
 import com.baomidou.mybatisplus.generator.config.rules.DbType;
@@ -98,6 +99,9 @@ public class PostgreSQLGenerator extends GeneratorTest {
         // 【实体】是否为构建者模型（默认 false）
         // public User setName(String name) {this.name = name; return this;}
         // strategy.setEntityBuliderModel(true);
+        List tableFillList = new ArrayList();
+        tableFillList.add(new TableFill("name", FieldFill.INSERT));
+        strategy.setTableFillList(tableFillList);
         mpg.setStrategy(strategy);
 
         // 包配置