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)