close #184

Author: Jarvis Song

spring-data-mybatis/src/main/java/org/springframework/data/mybatis/repository/support/MybatisBasicMapperBuilder.java

@@ -9,6 +9,7 @@
 import static org.apache.ibatis.mapping.SqlCommandType.UPDATE;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -42,6 +43,7 @@
 import org.apache.ibatis.executor.keygen.NoKeyGenerator;
 import org.apache.ibatis.executor.keygen.SelectKeyGenerator;
 import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.ResultFlag;
 import org.apache.ibatis.mapping.ResultMapping;
 import org.apache.ibatis.session.Configuration;
 
@@ -84,32 +86,32 @@ private void addResultMap() {
 
 			if (p.isAnnotationPresent(EmbeddedId.class) || p.isEmbeddable()) {
 
-				List<ResultMapping> nestedResultMappings = new ArrayList<>();
-
 				((MybatisPersistentEntityImpl) entity)
 						.getRequiredPersistentEntity(p.getActualType()).doWithProperties(
 								(PropertyHandler<MybatisPersistentProperty>) ep -> {
-									// build mybatis result map association
-									nestedResultMappings.add(assistant.buildResultMapping(
-											ep.getType(), ep.getName(),
-											ep.getColumnName(), ep.getType(),
-											ep.getJdbcType(), null, null, null, null,
-											ep.getSpecifiedTypeHandler(), null));
+
+									resultMappings.add(
+											assistant.buildResultMapping(ep.getType(),
+													String.format("%s.%s", p.getName(),
+															ep.getName()),
+													ep.getColumnName(), ep.getType(),
+													ep.getJdbcType(), null, null, null,
+													null, ep.getSpecifiedTypeHandler(),
+													p.isIdProperty()
+															? Collections.singletonList(
+																	ResultFlag.ID)
+															: null));
 
 								});
-				addResultMap(RESULT_MAP + "_" + p.getName(), p.getActualType(),
-						nestedResultMappings);
-				resultMappings.add(assistant.buildResultMapping(p.getType(), p.getName(),
-						p.getColumnName(), p.getType(), p.getJdbcType(), null,
-						RESULT_MAP + "_" + p.getName(), null, null,
-						p.getSpecifiedTypeHandler(), null));
-			}
-			else {
-				resultMappings.add(assistant.buildResultMapping(p.getType(), p.getName(),
-						p.getColumnName(), p.getType(), p.getJdbcType(), null, null, null,
-						null, p.getSpecifiedTypeHandler(), null));
+
+				return;
 			}
 
+			resultMappings.add(assistant.buildResultMapping(p.getType(), p.getName(),
+					p.getColumnName(), p.getType(), p.getJdbcType(), null, null, null,
+					null, p.getSpecifiedTypeHandler(),
+					p.isIdProperty() ? Collections.singletonList(ResultFlag.ID) : null));
+
 		});
 
 		addResultMap(RESULT_MAP, entity.getType(), resultMappings);

spring-data-mybatis/src/main/java/org/springframework/data/mybatis/repository/support/MybatisMapperBuildAssistant.java

@@ -380,7 +380,7 @@ protected void addResultMap(String id, Class<?> type,
 		if (log.isDebugEnabled()) {
 			System.out.println(
 					"/*【" + this.assistant.getCurrentNamespace() + '.' + id + "】 */");
-			System.out.println(resultMappings);
+			resultMappings.stream().forEach(System.out::println);
 		}
 	}