diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsProductSalesScriptBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsProductSalesScriptBo.java index cedc6eda..0cb51bdf 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsProductSalesScriptBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsProductSalesScriptBo.java @@ -52,5 +52,10 @@ public class WmsProductSalesScriptBo extends BaseEntity { */ private String remark; + /** + * 标题和内容同时模糊查询 + */ + private String keyword; + } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProductSalesScriptServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProductSalesScriptServiceImpl.java index 45595f48..b93fa3c6 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsProductSalesScriptServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProductSalesScriptServiceImpl.java @@ -66,6 +66,13 @@ public class WmsProductSalesScriptServiceImpl implements IWmsProductSalesScriptS lqw.eq(StringUtils.isNotBlank(bo.getScriptContent()), WmsProductSalesScript::getScriptContent, bo.getScriptContent()); lqw.eq(StringUtils.isNotBlank(bo.getFeaturePoint()), WmsProductSalesScript::getFeaturePoint, bo.getFeaturePoint()); lqw.eq(bo.getIsEnabled() != null, WmsProductSalesScript::getIsEnabled, bo.getIsEnabled()); + if (StringUtils.isNotBlank(bo.getKeyword())) { + lqw.and(wrapper -> wrapper + .like(WmsProductSalesScript::getScriptTitle, bo.getKeyword()) + .or() + .like(WmsProductSalesScript::getScriptContent, bo.getKeyword()) + ); + } return lqw; }