|
|
@@ -187,10 +187,10 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
|
|
|
List<Integer> equipmentIds = racksEquipmentMapper.selectList(new QueryWrapper<RacksEquipment>().eq("rack_goods_id", id)).stream().map(RacksEquipment::getEquipmentGoodsId).collect(Collectors.toList());
|
|
|
if(equipmentIds.size()>0){
|
|
|
List<GoodsVO> list = goodsMapper.getEuipmentList(equipmentIds);
|
|
|
- GoodsVO vo = goodsMapper.getDetail(id);
|
|
|
- map.put("rack",vo);
|
|
|
map.put("equipments",list);
|
|
|
}
|
|
|
+ GoodsVO vo = goodsMapper.getDetail(id);
|
|
|
+ map.put("rack",vo);
|
|
|
msg.data = map;
|
|
|
return msg;
|
|
|
}else{
|
