DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2025-07-26 09:19:20 +08:00
parent 0d6912c4dd c85bfd745b
commit a78bf64529
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
klp-wms/src/main/java/com/klp/domain/bo/WmsProductSalesScriptBo.java
View File

@@ -52,5 +52,10 @@ public class WmsProductSalesScriptBo extends BaseEntity {
*/ */
private String remark; private String remark;
/**
* 标题和内容同时模糊查询
*/
private String keyword;
} }

7
klp-wms/src/main/java/com/klp/service/impl/WmsProductSalesScriptServiceImpl.java
View File

@@ -66,6 +66,13 @@ public class WmsProductSalesScriptServiceImpl implements IWmsProductSalesScriptS
lqw.eq(StringUtils.isNotBlank(bo.getScriptContent()), WmsProductSalesScript::getScriptContent, bo.getScriptContent()); lqw.eq(StringUtils.isNotBlank(bo.getScriptContent()), WmsProductSalesScript::getScriptContent, bo.getScriptContent());
lqw.eq(StringUtils.isNotBlank(bo.getFeaturePoint()), WmsProductSalesScript::getFeaturePoint, bo.getFeaturePoint()); lqw.eq(StringUtils.isNotBlank(bo.getFeaturePoint()), WmsProductSalesScript::getFeaturePoint, bo.getFeaturePoint());
lqw.eq(bo.getIsEnabled() != null, WmsProductSalesScript::getIsEnabled, bo.getIsEnabled()); 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; return lqw;
} }