From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/config/mybatis/wrapper/NullFilterWrapper.java | 4 ++--
1 files changed, 2 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 edae5c0..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
@@ -17,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
--
Gitblit v1.8.0