From f4d812a466991d8fa6bc34d8b2ddc5881cd2b50d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= <fuhai999@gmail.com>
Date: Fri, 7 Apr 2023 12:23:52 +0800
Subject: [PATCH] fixed apt error and update apt package

---
 .../{processer => processor}/MyBatisFlexProps.java        | 2 +-
 .../{processer => processor}/QueryEntityProcessor.java    | 8 ++++++--
 .../services/javax.annotation.processing.Processor        | 2 +-
 .../src/main/java/com/mybatisflex/test/Account.java       | 5 ++++-
 4 files changed, 12 insertions(+), 5 deletions(-)
 rename mybatis-flex-annotation/src/main/java/com/mybatisflex/{processer => processor}/MyBatisFlexProps.java (99%)
 rename mybatis-flex-annotation/src/main/java/com/mybatisflex/{processer => processor}/QueryEntityProcessor.java (98%)

diff --git a/mybatis-flex-annotation/src/main/java/com/mybatisflex/processer/MyBatisFlexProps.java b/mybatis-flex-annotation/src/main/java/com/mybatisflex/processor/MyBatisFlexProps.java
similarity index 99%
rename from mybatis-flex-annotation/src/main/java/com/mybatisflex/processer/MyBatisFlexProps.java
rename to mybatis-flex-annotation/src/main/java/com/mybatisflex/processor/MyBatisFlexProps.java
index ffd4eed0..ca77cf9d 100644
--- a/mybatis-flex-annotation/src/main/java/com/mybatisflex/processer/MyBatisFlexProps.java
+++ b/mybatis-flex-annotation/src/main/java/com/mybatisflex/processor/MyBatisFlexProps.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mybatisflex.processer;
+package com.mybatisflex.processor;
 
 
 import java.io.*;
diff --git a/mybatis-flex-annotation/src/main/java/com/mybatisflex/processer/QueryEntityProcessor.java b/mybatis-flex-annotation/src/main/java/com/mybatisflex/processor/QueryEntityProcessor.java
similarity index 98%
rename from mybatis-flex-annotation/src/main/java/com/mybatisflex/processer/QueryEntityProcessor.java
rename to mybatis-flex-annotation/src/main/java/com/mybatisflex/processor/QueryEntityProcessor.java
index e5127182..2655c1e9 100644
--- a/mybatis-flex-annotation/src/main/java/com/mybatisflex/processer/QueryEntityProcessor.java
+++ b/mybatis-flex-annotation/src/main/java/com/mybatisflex/processor/QueryEntityProcessor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mybatisflex.processer;
+package com.mybatisflex.processor;
 
 
 import com.mybatisflex.annotation.Column;
@@ -257,7 +257,11 @@ public class QueryEntityProcessor extends AbstractProcessor {
 
 
         StringJoiner defaultColumnStringJoiner = new StringJoiner(", ");
-        defaultColumns.forEach(s -> defaultColumnStringJoiner.add(camelToUnderline(s).toUpperCase()));
+        propertyAndColumns.forEach((property, column) -> {
+            if (defaultColumns.contains(column)) {
+                defaultColumnStringJoiner.add(camelToUnderline(property).toUpperCase());
+            }
+        });
         String defaultColumnsString = defaultColumnsTemplate.replace("@allColumns", defaultColumnStringJoiner.toString());
 
 
diff --git a/mybatis-flex-annotation/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/mybatis-flex-annotation/src/main/resources/META-INF/services/javax.annotation.processing.Processor
index 1ba3560b..c5f9f5e9 100644
--- a/mybatis-flex-annotation/src/main/resources/META-INF/services/javax.annotation.processing.Processor
+++ b/mybatis-flex-annotation/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1 @@
-com.mybatisflex.processer.QueryEntityProcessor
\ No newline at end of file
+com.mybatisflex.processor.QueryEntityProcessor
\ No newline at end of file
diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Account.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Account.java
index b1316743..75a0b06f 100644
--- a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Account.java
+++ b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Account.java
@@ -21,7 +21,10 @@ public class Account {
 
     private Date birthday;
 
-    @Column(typeHandler = Fastjson2TypeHandler.class)
+    @Column("DEPT_ID_")
+    private String deptId;
+
+    @Column(typeHandler = Fastjson2TypeHandler.class,isLarge = true)
     private Map<String, Object> options;
 
     public Long getId() {