根据李领北建议修改propertyMap#159

abel533 · abel533 · commit cb7fe79b2598 · 2016-09-04T11:09:54.000+08:00
diff --git a/src/main/java/tk/mybatis/mapper/entity/EntityTable.java b/src/main/java/tk/mybatis/mapper/entity/EntityTable.java
@@ -31,9 +31,7 @@
 import tk.mybatis.mapper.util.StringUtil;
 
 import javax.persistence.Table;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * 数据库表
@@ -55,6 +53,8 @@ public class EntityTable {
     private List<String> keyColumns;
     //resultMap对象
     private ResultMap resultMap;
+    //属性和列对应
+    protected Map<String, EntityColumn> propertyMap;
     //类
     private Class<?> entityClass;
 
@@ -215,4 +215,18 @@ public ResultMap getResultMap(Configuration configuration) {
         this.resultMap = builder.build();
         return this.resultMap;
     }
+
+    /**
+     * 初始化 - Example 会使用
+     */
+    public void initPropertyMap() {
+        propertyMap = new HashMap<String, EntityColumn>(getEntityClassColumns().size());
+        for (EntityColumn column : getEntityClassColumns()) {
+            propertyMap.put(column.getProperty(), column);
+        }
+    }
+
+    public Map<String, EntityColumn> getPropertyMap() {
+        return propertyMap;
+    }
 }
diff --git a/src/main/java/tk/mybatis/mapper/entity/Example.java b/src/main/java/tk/mybatis/mapper/entity/Example.java
@@ -91,10 +91,8 @@ public Example(Class<?> entityClass, boolean exists, boolean notNull) {
         oredCriteria = new ArrayList<Criteria>();
         this.entityClass = entityClass;
         table = EntityHelper.getEntityTable(entityClass);
-        propertyMap = new HashMap<String, EntityColumn>(table.getEntityClassColumns().size());
-        for (EntityColumn column : table.getEntityClassColumns()) {
-            propertyMap.put(column.getProperty(), column);
-        }
+        //根据李领北建议修改#159
+        propertyMap = table.getPropertyMap();
         this.ORDERBY = new OrderBy(this, propertyMap);
     }
 
diff --git a/src/main/java/tk/mybatis/mapper/mapperhelper/EntityHelper.java b/src/main/java/tk/mybatis/mapper/mapperhelper/EntityHelper.java
@@ -223,6 +223,7 @@ public static synchronized void initEntityNameMap(Class<?> entityClass, Config c
         if (entityTable.getEntityClassPKColumns().size() == 0) {
             entityTable.setEntityClassPKColumns(entityTable.getEntityClassColumns());
         }
+        entityTable.initPropertyMap();
         entityTableMap.put(entityClass, entityTable);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,7 @@ public static synchronized void initEntityNameMap(Class<?> entityClass, Config c`
`223`	`223`	`if (entityTable.getEntityClassPKColumns().size() == 0) {`
`224`	`224`	`entityTable.setEntityClassPKColumns(entityTable.getEntityClassColumns());`
`225`	`225`	`}`
	`226`	`+ entityTable.initPropertyMap();`
`226`	`227`	`entityTableMap.put(entityClass, entityTable);`
`227`	`228`	`}`
`228`	`229`