|
@@ -4,7 +4,6 @@ import cn.hutool.core.util.ArrayUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
@@ -27,14 +26,14 @@ public class LambdaQueryWrapperX<T> extends LambdaQueryWrapper<T> {
|
|
|
}
|
|
|
|
|
|
public LambdaQueryWrapperX<T> inIfPresent(SFunction<T, ?> column, Collection<?> values) {
|
|
|
- if (!CollectionUtils.isEmpty(values)) {
|
|
|
+ if (ObjectUtil.isAllNotEmpty(values) && !ArrayUtil.isEmpty(values)) {
|
|
|
return (LambdaQueryWrapperX<T>) super.in(column, values);
|
|
|
}
|
|
|
return this;
|
|
|
}
|
|
|
|
|
|
public LambdaQueryWrapperX<T> inIfPresent(SFunction<T, ?> column, Object... values) {
|
|
|
- if (!ArrayUtil.isEmpty(values)) {
|
|
|
+ if (ObjectUtil.isAllNotEmpty(values) && !ArrayUtil.isEmpty(values)) {
|
|
|
return (LambdaQueryWrapperX<T>) super.in(column, values);
|
|
|
}
|
|
|
return this;
|