EntityInfo优化

src/main/java/org/redkale/source/AbstractDataSource.java

@@ -216,7 +216,7 @@ public abstract class AbstractDataSource extends AbstractService implements Data
      * @return 对象
      */
     protected <T> T getEntityValue(EntityInfo<T> info, final SelectColumn sels, final EntityInfo.DataResultSetRow row) {
-        return sels == null ? info.getBuilder().getFullEntityValue(row) : info.getBuilder().getEntityValue(sels, row);
+        return info.getBuilder().getEntityValue(sels, row);
     }
 
     /**

src/main/java/org/redkale/source/ColumnValue.java

@@ -21,7 +21,7 @@ import org.redkale.util.*;
  *
  * @author zhangjx
  */
-public class ColumnValue {
+public class ColumnValue implements Comparable<ColumnValue> {
 
     @ConvertColumn(index = 1)
     private String column;
@@ -528,8 +528,14 @@ public class ColumnValue {
         this.value = value;
     }
 
+    @Override
+    public int compareTo(ColumnValue o) {
+        return o == null ? 1 : this.column.compareTo(o.column);
+    }
+
     @Override
     public String toString() {
         return "{\"column\":\"" + column + "\", \"express\":" + express + ", \"value\":" + value + "}";
     }
+
 }

src/main/java/org/redkale/source/EntityInfo.java

@@ -701,6 +701,11 @@ public final class EntityInfo<T> {
         return (V) this.subobjectMap.get(name);
     }
 
+    @SuppressWarnings("unchecked")
+    public <V> V getSubobjectIfAbsent(String name, Function<String, ? extends V> func) {
+        return (V) this.subobjectMap.computeIfAbsent(name, func);
+    }
+
     public void setSubobject(String name, Object value) {
         this.subobjectMap.put(name, value);
     }