|
@@ -135,8 +135,8 @@ private KcGoodsServiceImpl kcGoodsService;
|
|
|
QueryWrapper<CesGoods> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<CesGoods> queryWrapper = new QueryWrapper<>();
|
|
|
if (!StringUtils.isBlank(dto.getSearch())) {
|
|
if (!StringUtils.isBlank(dto.getSearch())) {
|
|
|
String search = CommonUtils.escapeChar(dto.getSearch());
|
|
String search = CommonUtils.escapeChar(dto.getSearch());
|
|
|
- queryWrapper.like(CesGoods.BAR_CODE, search);
|
|
|
|
|
- queryWrapper.like(CesGoods.NAME, search);
|
|
|
|
|
|
|
+ queryWrapper.or().like(CesGoods.BAR_CODE, search);
|
|
|
|
|
+ queryWrapper.or().like(CesGoods.NAME, search);
|
|
|
}
|
|
}
|
|
|
if (!StringUtils.isBlank(dto.getTypeId())) {
|
|
if (!StringUtils.isBlank(dto.getTypeId())) {
|
|
|
String typeId = CommonUtils.escapeChar(dto.getTypeId());
|
|
String typeId = CommonUtils.escapeChar(dto.getTypeId());
|