修复重构后Page获取数据扩展信息时候，执行字段Functional没成功赋值的Bug

Yiuman · Jan 20, 2021 · af90bab · af90bab
1 parent 6142fe7
commit af90bab
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/citrus-support/src/main/java/com/github/yiuman/citrus/support/model/Page.java b/citrus-support/src/main/java/com/github/yiuman/citrus/support/model/Page.java
@@ -2,14 +2,14 @@
 
 import com.github.yiuman.citrus.support.crud.view.RecordExtender;
 import com.github.yiuman.citrus.support.crud.view.TableView;
-import com.github.yiuman.citrus.support.crud.view.impl.DialogView;
 import com.github.yiuman.citrus.support.crud.view.impl.SimpleTableView;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -57,24 +57,27 @@ public void setItemKey(String itemKey) {
         this.itemKey = itemKey;
     }
 
-    @SuppressWarnings("unchecked")
+
     public Map<String, Map<String, Object>> getRecordExtend() {
-        if (this.recordExtend == null) {
-            this.recordExtend = new HashMap<>();
-            if (!StringUtils.isEmpty(itemKey)) {
-                if (view instanceof RecordExtender) {
-                    RecordExtender<T> recordExtender = (RecordExtender<T>) view;
-                    getRecords().forEach(record -> recordExtend.put(key(record), recordExtender.apply(record)));
-                }
-            }
-        }
         return recordExtend;
     }
 
     public void setRecordExtend(Map<String, Map<String, Object>> recordExtend) {
         this.recordExtend = recordExtend;
     }
 
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<T> getRecords() {
+        List<T> records = super.getRecords();
+        if (this.recordExtend == null && !StringUtils.isEmpty(itemKey) && view instanceof RecordExtender) {
+            this.recordExtend = new HashMap<>();
+            RecordExtender<T> recordExtender = (RecordExtender<T>) view;
+            records.forEach(record -> recordExtend.put(key(record), recordExtender.apply(record)));
+        }
+        return records;
+    }
+
     public Object getView() {
         return view;
     }