在 Fn 中修改了规则：

1. 先区分大小写匹配字段 2. 如果不存在，再忽略大小写进行匹配
Nefelibata716 · Apr 17, 2022 · 828dcdd · 828dcdd
1 parent 7182643
commit 828dcdd
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/mapper/src/main/java/io/mybatis/mapper/fn/Fn.java b/mapper/src/main/java/io/mybatis/mapper/fn/Fn.java
@@ -92,7 +92,7 @@ default String toColumn() {
   default Reflections.ClassField toClassField() {
     if (!FN_CLASS_FIELD_MAP.containsKey(this)) {
       synchronized (this) {
-        if(!FN_CLASS_FIELD_MAP.containsKey(this)) {
+        if (!FN_CLASS_FIELD_MAP.containsKey(this)) {
           FN_CLASS_FIELD_MAP.put(this, Reflections.fnToFieldName(this));
         }
       }
@@ -110,10 +110,14 @@ default EntityColumn toEntityColumn() {
       synchronized (this) {
         if (!FN_COLUMN_MAP.containsKey(this)) {
           Reflections.ClassField classField = toClassField();
-          EntityColumn entityColumn = EntityFactory.create(classField.getClazz()).columns().stream()
-            .filter(column -> column.property().equals(classField.getField())).findFirst()
-            .orElseThrow(() -> new RuntimeException(classField.getField()
-              + " does not mark database column field annotations, unable to obtain column information"));
+          List<EntityColumn> columns = EntityFactory.create(classField.getClazz()).columns();
+          EntityColumn entityColumn = columns.stream()
+              // 先区分大小写匹配字段
+              .filter(column -> column.property().equals(classField.getField())).findFirst()
+              // 如果不存在，再忽略大小写进行匹配
+              .orElseGet(() -> columns.stream().filter(column -> column.property().equalsIgnoreCase(classField.getField()))
+                  .findFirst().orElseThrow(() -> new RuntimeException(classField.getField()
+                      + " does not mark database column field annotations, unable to obtain column information")));
           FN_COLUMN_MAP.put(this, entityColumn);
         }
       }