Included nestedQuery/nestedResultMap columns in rowKey

Author: cbegin

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

@@ -212,19 +212,17 @@ private List<ResultMapping> getResultMappingsForRowKey(ResultMap resultMap) {
 
   private void createRowKeyForMappedProperties(ResultSet rs, CacheKey cacheKey, List<ResultMapping> resultMappings) {
     for (ResultMapping resultMapping : resultMappings) {
-      if (resultMapping.getNestedQueryId() == null && resultMapping.getNestedResultMapId() == null) {
-        final String column = resultMapping.getColumn();
-        final TypeHandler th = resultMapping.getTypeHandler();
-        if (column != null) {
-          try {
-            final Object value = th.getResult(rs, column);
-            if (value != null) {
-              cacheKey.update(column);
-              cacheKey.update(value);
-            }
-          } catch (Exception e) {
-            //ignore
+      final String column = resultMapping.getColumn();
+      final TypeHandler th = resultMapping.getTypeHandler();
+      if (column != null) {
+        try {
+          final Object value = th.getResult(rs, column);
+          if (value != null) {
+            cacheKey.update(column);
+            cacheKey.update(value);
           }
+        } catch (Exception e) {
+          //ignore
         }
       }
     }