From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/config/mybatis/wrapper/NullFilterWrapper.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/config/mybatis/wrapper/NullFilterWrapper.java b/screen-manage/src/main/java/com/moral/api/config/mybatis/wrapper/NullFilterWrapper.java
index 6539edb..abba47a 100644
--- a/screen-manage/src/main/java/com/moral/api/config/mybatis/wrapper/NullFilterWrapper.java
+++ b/screen-manage/src/main/java/com/moral/api/config/mybatis/wrapper/NullFilterWrapper.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.enums.SqlKeyword;
import com.baomidou.mybatisplus.core.enums.SqlLike;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Collection;
/**
* @ClassName FiltNullWrapper
@@ -14,10 +17,10 @@
public class NullFilterWrapper<T> extends QueryWrapper<T> {
@Override
- protected QueryWrapper<T> likeValue(boolean condition, String column, Object val, SqlLike sqlLike) {
+ protected QueryWrapper<T> likeValue(boolean condition, SqlKeyword keyword, String column, Object val, SqlLike sqlLike) {
if(val==null)
condition = false;
- return super.likeValue(condition, column, val, sqlLike);
+ return super.likeValue(condition, keyword, column, val, sqlLike);
}
@Override
@@ -33,4 +36,11 @@
condition = false;
return super.eq(condition, column, val);
}
+
+ @Override
+ public QueryWrapper<T> in(boolean condition, String column, Collection<?> coll) {
+ if(ObjectUtils.isEmpty(coll))
+ condition = false;
+ return super.in(condition, column, coll);
+ }
}
--
Gitblit v1.8.0