From 83bdb978424123b4d4c31458597025df22154df4 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Sat, 24 Jun 2017 12:31:20 +0800
Subject: [PATCH]

---
 src/org/redkale/convert/ConvertFactory.java | 4 ++++
 src/org/redkale/convert/ObjectDecoder.java  | 4 ++--
 src/org/redkale/convert/ObjectEncoder.java  | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/org/redkale/convert/ConvertFactory.java b/src/org/redkale/convert/ConvertFactory.java
index dd3034078..1ddfa87af 100644
--- a/src/org/redkale/convert/ConvertFactory.java
+++ b/src/org/redkale/convert/ConvertFactory.java
@@ -135,6 +135,10 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
 
     public abstract ConvertFactory createChild(boolean tiny);
 
+    public boolean isIndexSort() { //是否使用@ConvertColumn.index排序
+        return false;
+    }
+
     public Convert getConvert() {
         return convert;
     }
diff --git a/src/org/redkale/convert/ObjectDecoder.java b/src/org/redkale/convert/ObjectDecoder.java
index f5208f871..d882b7eb5 100644
--- a/src/org/redkale/convert/ObjectDecoder.java
+++ b/src/org/redkale/convert/ObjectDecoder.java
@@ -79,7 +79,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
                     if (ref != null && ref.ignore()) continue;
                     Type t = TypeToken.createClassType(field.getGenericType(), this.type);
                     DeMember member = new DeMember(ObjectEncoder.createAttribute(factory, clazz, field, null, null), factory.loadDecoder(t));
-                    if (ref != null) member.index = ref.getIndex();
+                    if (factory.isIndexSort() && ref != null) member.index = ref.getIndex();
                     list.add(member);
                 }
                 final boolean reversible = factory.isReversible();
@@ -104,7 +104,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
                     if (ref != null && ref.ignore()) continue;
                     Type t = TypeToken.createClassType(method.getGenericParameterTypes()[0], this.type);
                     DeMember member = new DeMember(ObjectEncoder.createAttribute(factory, clazz, null, null, method), factory.loadDecoder(t));
-                    if (ref != null) member.index = ref.getIndex();
+                    if (factory.isIndexSort() && ref != null) member.index = ref.getIndex();
                     list.add(member);
                 }
                 if (cps != null) { //可能存在某些构造函数中的字段名不存在setter方法
diff --git a/src/org/redkale/convert/ObjectEncoder.java b/src/org/redkale/convert/ObjectEncoder.java
index 3dcd5624d..14a2f54c5 100644
--- a/src/org/redkale/convert/ObjectEncoder.java
+++ b/src/org/redkale/convert/ObjectEncoder.java
@@ -70,7 +70,7 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
                     if (ref != null && ref.ignore()) continue;
                     Type t = TypeToken.createClassType(field.getGenericType(), this.type);
                     EnMember member = new EnMember(createAttribute(factory, clazz, field, null, null), factory.loadEncoder(t));
-                    if (ref != null) member.index = ref.getIndex();
+                    if (factory.isIndexSort() && ref != null) member.index = ref.getIndex();
                     list.add(member);
                 }
                 for (final Method method : clazz.getMethods()) {
@@ -95,7 +95,7 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
                     if (ref != null && ref.ignore()) continue;
                     Type t = TypeToken.createClassType(method.getGenericReturnType(), this.type);
                     EnMember member = new EnMember(createAttribute(factory, clazz, null, method, null), factory.loadEncoder(t));
-                    if (ref != null) member.index = ref.getIndex();
+                    if (factory.isIndexSort() && ref != null) member.index = ref.getIndex();
                     list.add(member);
                 }
                 this.members = list.toArray(new EnMember[list.size()]);