From a34c5cf60eb01f336b4e178a94eac43ad1f1c8c9 Mon Sep 17 00:00:00 2001 From: HuangHuiKang Date: Mon, 8 Jun 2026 17:31:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=85=B7?= =?UTF-8?q?=E7=BB=84=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/mold/vo/MoldBrandPageReqVO.java | 3 +++ .../common/dal/mysql/mold/MoldBrandMapper.java | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandPageReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandPageReqVO.java index 038e9c759..4181a5c5c 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandPageReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandPageReqVO.java @@ -74,4 +74,7 @@ public class MoldBrandPageReqVO extends PageParam { @Schema(description = "id集合导出用") private String ids; + + @Schema(description = "关键字(匹配编码/名称/产品型号)") + private String keyword; } diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldBrandMapper.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldBrandMapper.java index f77203d98..1c87021bc 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldBrandMapper.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldBrandMapper.java @@ -42,6 +42,18 @@ public interface MoldBrandMapper extends BaseMapperX { .betweenIfPresent(MoldBrandDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(MoldBrandDO::getId); + //关键字(匹配编码/名称/产品型号) + if (StringUtils.isNotBlank(reqVO.getKeyword())) { + queryWrapper.and(wrapper -> + wrapper.like(MoldBrandDO::getCode, reqVO.getKeyword()) + .or() + .like(MoldBrandDO::getName, reqVO.getKeyword()) + .or() + .like(MoldBrandDO::getProductName, reqVO.getKeyword()) + ); + } + + if (StringUtils.isNotBlank(reqVO.getIds())) { List idList = Arrays.stream(reqVO.getIds().split(",")) .map(String::trim)