From 09c1955da859a55b1dac91546d3646171a9e8a8c Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Wed, 27 Mar 2024 20:51:54 +0800
Subject: [PATCH] =?UTF-8?q?test:=20=E6=B5=8B=E8=AF=95=20null=20=E5=80=BC?=
 =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mybatisflex/coretest/DynamicConditionTest.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicConditionTest.java b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicConditionTest.java
index 1cd5557a..49b74d8c 100644
--- a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicConditionTest.java
+++ b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicConditionTest.java
@@ -31,6 +31,7 @@ import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -238,10 +239,11 @@ public class DynamicConditionTest {
         QueryWrapper queryWrapper = QueryWrapper.create()
             .select().from(ACCOUNT)
             .where(ACCOUNT.IS_DELETE.eq(0))
-            .or(raw("1 = 1").or(ACCOUNT.ID.eq(123)));
+            .or(raw("1 = 1").or(ACCOUNT.ID.eq(123)))
+            .and(ACCOUNT.AGE.ge(1));
         String sql = queryWrapper.toSQL();
         System.out.println(sql);
-        assertEquals("SELECT * FROM `tb_account` WHERE `is_delete` = 0 OR ( 1 = 1  OR `id` = 123)", sql);
+        assertEquals("SELECT * FROM `tb_account` WHERE `is_delete` = 0 OR ( 1 = 1  OR `id` = 123) AND `age` >= 1", sql);
     }
 
 
@@ -365,7 +367,7 @@ public class DynamicConditionTest {
             .from(ACCOUNT)
             .where(ACCOUNT.ID.eq(null))
             .and(ACCOUNT.USER_NAME.eq("QAQ", false))
-            .and(ACCOUNT.AGE.ne(null))
+            .and(ACCOUNT.AGE.ge(null).or(ACCOUNT.BIRTHDAY.ne(new Date())))
             .and(QueryCondition.createEmpty());
         String sql1 = queryWrapper.toSQL();
         System.out.println(sql1);