From fc81fb7262b53317dd7b5c5442bec30fb201a121 Mon Sep 17 00:00:00 2001 From: han0 Date: Tue, 19 Dec 2023 16:46:29 +0800 Subject: [PATCH] =?UTF-8?q?fix(material):=20=E4=BF=AE=E5=A4=8D=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E5=AD=97=E6=9F=A5=E8=AF=A2=E5=AF=BC=E8=87=B4=E6=97=A0?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/mjkf/xinke/main/controller/MaterialController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mjkf/xinke/main/controller/MaterialController.java b/src/main/java/mjkf/xinke/main/controller/MaterialController.java index 7acff52..558d66e 100644 --- a/src/main/java/mjkf/xinke/main/controller/MaterialController.java +++ b/src/main/java/mjkf/xinke/main/controller/MaterialController.java @@ -1,8 +1,8 @@ package mjkf.xinke.main.controller; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jgy.xxs.core.common.util.CommonUtil; import com.jgy.xxs.core.http.exp.NcHttpException; import com.jgy.xxs.core.http.resp.HttpResponse; @@ -70,7 +70,7 @@ public class MaterialController { if (parentId != null) { query.eq(Material::getParentId, parentId); } - if (keyWord != null) { + if (keyWord != null && ObjectUtil.isNotEmpty(keyWord)) { query.and(q -> q .like(Material::getCategory1, keyWord).or() .like(Material::getCategory2, keyWord).or()