|
@@ -667,11 +667,6 @@ public class ConfigBuilder {
|
|
|
if (commentSupported) {
|
|
|
field.setComment(results.getString(dbQuery.fieldComment()));
|
|
|
}
|
|
|
- if (strategyConfig.includeSuperEntityColumns(field.getName())) {
|
|
|
- // 跳过公共字段
|
|
|
- commonFieldList.add(field);
|
|
|
- continue;
|
|
|
- }
|
|
|
// 填充逻辑判断
|
|
|
List<TableFill> tableFillList = getStrategyConfig().getTableFillList();
|
|
|
if (null != tableFillList) {
|
|
@@ -679,6 +674,11 @@ public class ConfigBuilder {
|
|
|
tableFillList.stream().filter(tf -> tf.getFieldName().equalsIgnoreCase(field.getName()))
|
|
|
.findFirst().ifPresent(tf -> field.setFill(tf.getFieldFill().name()));
|
|
|
}
|
|
|
+ if (strategyConfig.includeSuperEntityColumns(field.getName())) {
|
|
|
+ // 跳过公共字段
|
|
|
+ commonFieldList.add(field);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
fieldList.add(field);
|
|
|
}
|
|
|
}
|