|
|
@@ -493,13 +493,15 @@ public class KwpGoodsService {
|
|
|
}
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(params.getKeywords())) {
|
|
|
- List<EntCacheResDto> entList = remoteSystemService.queryEntCacheByName(params.getKeywords());
|
|
|
- List<Long> entIds = entList.stream().map(EntCacheResDto::getId).toList();
|
|
|
- if (CollectionUtils.isEmpty(entIds)) {
|
|
|
- wrapper.like(KwpGoods::getName, params.getKeywords());
|
|
|
- } else {
|
|
|
- wrapper.and(e -> e.in(KwpGoods::getSupplyEntId, entIds).or().like(KwpGoods::getName, params.getKeywords()));
|
|
|
- }
|
|
|
+ //目前只模糊匹配商品名称
|
|
|
+// List<EntCacheResDto> entList = remoteSystemService.queryEntCacheByName(params.getKeywords());
|
|
|
+// List<Long> entIds = entList.stream().map(EntCacheResDto::getId).toList();
|
|
|
+// if (CollectionUtils.isEmpty(entIds)) {
|
|
|
+// wrapper.like(KwpGoods::getName, params.getKeywords());
|
|
|
+// } else {
|
|
|
+// wrapper.and(e -> e.in(KwpGoods::getSupplyEntId, entIds).or().like(KwpGoods::getName, params.getKeywords()));
|
|
|
+// }
|
|
|
+ wrapper.like(KwpGoods::getName, params.getKeywords());
|
|
|
}
|
|
|
}
|
|
|
wrapper.eq(KwpGoods::getEntId, LoginUserHolder.getEntId()).eq(KwpGoods::getDelFlag, Global.NO).orderByDesc(KwpGoods::getCreateTime);
|