diff --git a/src/org/redkale/convert/ConvertColumnEntry.java b/src/org/redkale/convert/ConvertColumnEntry.java index c73a2c17e..1b10dd09a 100644 --- a/src/org/redkale/convert/ConvertColumnEntry.java +++ b/src/org/redkale/convert/ConvertColumnEntry.java @@ -89,4 +89,9 @@ public final class ConvertColumnEntry { this.index = index; } + @Override + public String toString() { + return "ConvertColumnEntry{" + "index=" + index + ", name=" + name + ", ignore=" + ignore + ", convertType=" + convertType + '}'; + } + } diff --git a/src/org/redkale/convert/ConvertFactory.java b/src/org/redkale/convert/ConvertFactory.java index 0784448db..2038fa32c 100644 --- a/src/org/redkale/convert/ConvertFactory.java +++ b/src/org/redkale/convert/ConvertFactory.java @@ -251,8 +251,8 @@ public abstract class ConvertFactory { } for (ConvertColumn ref : ccs) { if (ref.type().contains(ct)) { + String realName = ref.name().isEmpty() ? fieldName : ref.name(); if (onlyColumns != null && fieldName != null) { - String realName = ref.name().isEmpty() ? fieldName : ref.name(); if (!onlyColumns.contains(realName)) return new ConvertColumnEntry(realName, true); } ConvertColumnEntry entry = new ConvertColumnEntry(ref); @@ -260,7 +260,10 @@ public abstract class ConvertFactory { entry.setIgnore(false); return entry; } - if (skipIgnores.isEmpty()) return entry; + if (skipIgnores.isEmpty()) { + if (onlyColumns != null && realName != null && onlyColumns.contains(realName)) entry.setIgnore(false); + return entry; + } if (skipIgnores.contains(((Member) element).getDeclaringClass())) entry.setIgnore(false); return entry; }