From 8d2c33e9b0848decc7ddc9b242639a36dfc147a1 Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Wed, 29 Mar 2023 21:19:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5=E7=AD=89=E5=80=BC=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=89=8D=E7=AB=AF=E4=BC=A0=E7=A9=BA=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8=E5=BF=BD?=
 =?UTF-8?q?=E7=95=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/mybatis/core/query/LambdaQueryWrapperX.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java
index d0bc6c9e8..33a108bc4 100644
--- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java
+++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java
@@ -1,9 +1,7 @@
 package cn.iocoder.yudao.framework.mybatis.core.query;
 
-import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ArrayUtil;
 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
-import cn.iocoder.yudao.framework.mybatis.core.enums.SqlConstants;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
@@ -13,7 +11,7 @@ import java.util.Collection;
 
 /**
  * 拓展 MyBatis Plus QueryWrapper 类，主要增加如下功能：
- *
+ * <p>
  * 1. 拼接条件的方法，增加 xxxIfPresent 方法，用于判断值不存在的时候，不要拼接到条件中。
  *
  * @param <T> 数据类型
@@ -42,14 +40,14 @@ public class LambdaQueryWrapperX<T> extends LambdaQueryWrapper<T> {
     }
 
     public LambdaQueryWrapperX<T> eqIfPresent(SFunction<T, ?> column, Object val) {
-        if (val != null) {
+        if (val instanceof String && StringUtils.hasText((String) val) || !(val instanceof String) && val != null) {
             return (LambdaQueryWrapperX<T>) super.eq(column, val);
         }
         return this;
     }
 
     public LambdaQueryWrapperX<T> neIfPresent(SFunction<T, ?> column, Object val) {
-        if (val != null) {
+        if (val instanceof String && StringUtils.hasText((String) val) || !(val instanceof String) && val != null) {
             return (LambdaQueryWrapperX<T>) super.ne(column, val);
         }
         return this;