admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-08 01:28:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 应该保留 entityClassElement 用于先查找 getter 方法。

Browse Source
This commit is contained in:
Suomm 2023-07-02 21:35:12 +08:00
parent abba6697e3
commit 1081811199
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mybatis-flex-processor/src/main/java/com/mybatisflex/processor/MybatisFlexProcessor.java
View File

@ -154,11 +154,10 @@ public class MybatisFlexProcessor extends AbstractProcessor {
List<String> defaultColumns = new ArrayList<>();
TypeElement classElement = (TypeElement) entityClassElement;
List<? extends Element> enclosedElements = classElement.getEnclosedElements();
do {
// 获取类属性和默认查询字段
fillColumnInfoList(columnInfoList, defaultColumns, enclosedElements, classElement, table.camelToUnderline());
fillColumnInfoList(columnInfoList, defaultColumns, (TypeElement) entityClassElement, classElement, table.camelToUnderline());
classElement = (TypeElement) typeUtils.asElement(classElement.getSuperclass());
} while (classElement != null);
@ -221,7 +220,7 @@ public class MybatisFlexProcessor extends AbstractProcessor {
return SourceVersion.latestSupported();
}
private void fillColumnInfoList(List<ColumnInfo> columnInfoList, List<String> defaultColumns, List<? extends Element> enclosedElements, TypeElement classElement, boolean camelToUnderline) {
private void fillColumnInfoList(List<ColumnInfo> columnInfoList, List<String> defaultColumns, TypeElement baseElement, TypeElement classElement, boolean camelToUnderline) {
for (Element fieldElement : classElement.getEnclosedElements()) {
// all fields
@ -285,8 +284,7 @@ public class MybatisFlexProcessor extends AbstractProcessor {
}
}
String[] alias = getColumnAliasByGetterMethod(enclosedElements, property);
String[] alias = getColumnAliasByGetterMethod(baseElement, property);
if (alias == null || alias.length == 0) {
ColumnAlias columnAlias = fieldElement.getAnnotation(ColumnAlias.class);
if (columnAlias != null) {
@ -309,8 +307,8 @@ public class MybatisFlexProcessor extends AbstractProcessor {
}
private String[] getColumnAliasByGetterMethod(List<? extends Element> enclosedElements, String property) {
for (Element enclosedElement : enclosedElements) {
private String[] getColumnAliasByGetterMethod(TypeElement baseElement, String property) {
for (Element enclosedElement : baseElement.getEnclosedElements()) {
if (ElementKind.METHOD == enclosedElement.getKind()) {
String methodName = enclosedElement.toString();
if (StrUtil.isGetterMethod(methodName, property)) {