avoid unexpected automapping when a explicit mapped proerty has the same name as another column

Author: 杜龙

src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java

@@ -477,7 +477,7 @@ private List<UnMappedColumnAutoMapping> createAutomaticMappings(ResultSetWrapper
           }
         }
         final String property = metaObject.findProperty(propertyName, configuration.isMapUnderscoreToCamelCase());
-        if (property != null && metaObject.hasSetter(property)) {
+        if (property != null && metaObject.hasSetter(property) && !resultMap.getMappedProperties().contains(property)) {
           final Class<?> propertyType = metaObject.getSetterType(property);
           if (typeHandlerRegistry.hasTypeHandler(propertyType, rsw.getJdbcType(columnName))) {
             final TypeHandler<?> typeHandler = rsw.getTypeHandler(propertyType, columnName);

src/main/java/org/apache/ibatis/mapping/ResultMap.java

@@ -35,6 +35,7 @@ public class ResultMap {
   private List<ResultMapping> constructorResultMappings;
   private List<ResultMapping> propertyResultMappings;
   private Set<String> mappedColumns;
+  private Set<String> mappedProperties;
   private Discriminator discriminator;
   private boolean hasNestedResultMaps;
   private boolean hasNestedQueries;
@@ -71,6 +72,7 @@ public ResultMap build() {
         throw new IllegalArgumentException("ResultMaps must have an id");
       }
       resultMap.mappedColumns = new HashSet<String>();
+      resultMap.mappedProperties = new HashSet<String>();
       resultMap.idResultMappings = new ArrayList<ResultMapping>();
       resultMap.constructorResultMappings = new ArrayList<ResultMapping>();
       resultMap.propertyResultMappings = new ArrayList<ResultMapping>();
@@ -88,6 +90,10 @@ public ResultMap build() {
             }
           }
         }
+        final String property = resultMapping.getProperty();
+        if(property != null) {
+          resultMap.mappedProperties.add(property);
+        }
         if (resultMapping.getFlags().contains(ResultFlag.CONSTRUCTOR)) {
           resultMap.constructorResultMappings.add(resultMapping);
         } else {
@@ -146,6 +152,10 @@ public Set<String> getMappedColumns() {
     return mappedColumns;
   }
 
+  public Set<String> getMappedProperties() {
+    return mappedProperties;
+  }
+
   public Discriminator getDiscriminator() {
     return discriminator;
   }