|
|
@@ -2273,13 +2273,22 @@ public class GoodsServiceImpl implements GoodsService {
|
|
|
if (StringUtils.hasText(code)) {
|
|
|
pageInfo.expression(like("code", code, false));
|
|
|
}
|
|
|
- return goodsDao.findAll(new Specification<Goods>() {
|
|
|
+ Page<Goods> goodsPage = goodsDao.findAll(new Specification<Goods>() {
|
|
|
@Override
|
|
|
public Predicate toPredicate(Root<Goods> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
|
|
|
query.where(pageInfo.getPredicates(root, query, builder));
|
|
|
return null;
|
|
|
}
|
|
|
}, pageInfo);
|
|
|
+ for (Goods goods : goodsPage.getContent()) {
|
|
|
+ if (goods.getUuid() != null) {
|
|
|
+ Component component = componentDao.findByUuid(goods.getUuid());
|
|
|
+ if (component != null) {
|
|
|
+ goods.setAttach(component.getAttach());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return goodsPage;
|
|
|
}
|
|
|
|
|
|
@Override
|