From 4329e799d309f2b80e5713b97f7a75d24d696851 Mon Sep 17 00:00:00 2001
From: chengyy <390518881@qq.com>
Date: Thu, 14 Jan 2021 18:05:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D@Column=20isNull=3Dfalse?=
 =?UTF-8?q?=20=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84bug.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gitee/sunchenbin/mybatis/actable/utils/ColumnUtils.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/utils/ColumnUtils.java b/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/utils/ColumnUtils.java
index 2161131..7dafd75 100644
--- a/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/utils/ColumnUtils.java
+++ b/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/utils/ColumnUtils.java
@@ -166,8 +166,12 @@ public class ColumnUtils {
             return false;
         }else if(column != null && column.isNull()){
             return true;
+        }else if(column != null && !column.isNull()){
+            return false;
         }else if(columnCommon != null && columnCommon.nullable()){
             return true;
+        }else if(columnCommon != null && !columnCommon.nullable()){
+            return false;
         }
         return true;
     }
-- 
Gitee


From 93427ad853e58b880f0e49f3cf4a14e68c8c4cb4 Mon Sep 17 00:00:00 2001
From: chengyy <390518881@qq.com>
Date: Thu, 14 Jan 2021 18:40:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96isNull=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/actable/utils/ColumnUtils.java           | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/utils/ColumnUtils.java b/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/utils/ColumnUtils.java
index 7dafd75..8a11498 100644
--- a/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/utils/ColumnUtils.java
+++ b/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/utils/ColumnUtils.java
@@ -164,14 +164,10 @@ public class ColumnUtils {
         IsNotNull isNotNull = field.getAnnotation(IsNotNull.class);
         if(null != isNotNull){
             return false;
-        }else if(column != null && column.isNull()){
-            return true;
-        }else if(column != null && !column.isNull()){
-            return false;
-        }else if(columnCommon != null && columnCommon.nullable()){
-            return true;
-        }else if(columnCommon != null && !columnCommon.nullable()){
-            return false;
+        }else if(column != null){
+            return column.isNull();
+        }else if(columnCommon != null){
+            return columnCommon.nullable();
         }
         return true;
     }
-- 
Gitee