From 8efd19e65d6ad2c2e1f77259f8748a5b86328ffe Mon Sep 17 00:00:00 2001
From: zhouhao <zh.sqy@qq.com>
Date: Fri, 8 Apr 2022 22:05:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9E=E4=BD=93=E6=98=A0?=
 =?UTF-8?q?=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/DefaultEntityResultWrapperFactory.java    | 4 ++--
 .../web/crud/configuration/DetectEntityColumnMapping.java   | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/configuration/DefaultEntityResultWrapperFactory.java b/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/configuration/DefaultEntityResultWrapperFactory.java
index 5f9b42d7b..20fbec0e2 100644
--- a/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/configuration/DefaultEntityResultWrapperFactory.java
+++ b/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/configuration/DefaultEntityResultWrapperFactory.java
@@ -5,6 +5,7 @@ import lombok.SneakyThrows;
 import org.hswebframework.ezorm.rdb.executor.wrapper.ResultWrapper;
 import org.hswebframework.ezorm.rdb.mapping.EntityManager;
 import org.hswebframework.ezorm.rdb.mapping.wrapper.EntityResultWrapper;
+import org.hswebframework.ezorm.rdb.mapping.wrapper.NestedEntityResultWrapper;
 
 @AllArgsConstructor
 public class DefaultEntityResultWrapperFactory implements EntityResultWrapperFactory {
@@ -14,8 +15,7 @@ public class DefaultEntityResultWrapperFactory implements EntityResultWrapperFac
     @Override
     @SneakyThrows
     public <T> ResultWrapper<T, ?> getWrapper(Class<T> tClass) {
-        return new EntityResultWrapper<>(() -> entityManager.newInstance(tClass),
-                entityManager.getMapping(tClass));
+        return new NestedEntityResultWrapper<>(entityManager.getMapping(tClass));
 
     }
 }
diff --git a/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/configuration/DetectEntityColumnMapping.java b/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/configuration/DetectEntityColumnMapping.java
index dbe2cf036..0638d3726 100644
--- a/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/configuration/DetectEntityColumnMapping.java
+++ b/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/configuration/DetectEntityColumnMapping.java
@@ -3,6 +3,7 @@ package org.hswebframework.web.crud.configuration;
 import org.hswebframework.ezorm.rdb.mapping.EntityColumnMapping;
 import org.hswebframework.ezorm.rdb.mapping.MappingFeatureType;
 import org.hswebframework.ezorm.rdb.metadata.RDBColumnMetadata;
+import org.hswebframework.ezorm.rdb.metadata.TableOrViewMetadata;
 
 import java.util.Map;
 import java.util.Optional;
@@ -44,6 +45,11 @@ class DetectEntityColumnMapping implements EntityColumnMapping {
         return mapping.getColumnPropertyMapping();
     }
 
+    @Override
+    public TableOrViewMetadata getTable() {
+        return mapping.getTable();
+    }
+
     @Override
     public String getId() {
         return id;