|
@@ -5,6 +5,7 @@ import java.util.List;
|
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Repository;
|
|
import org.springframework.stereotype.Repository;
|
|
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
|
|
import com.uas.search.console.model.ComponentSimpleInfo;
|
|
import com.uas.search.console.model.ComponentSimpleInfo;
|
|
|
import com.uas.search.console.model.GoodsSimpleInfo;
|
|
import com.uas.search.console.model.GoodsSimpleInfo;
|
|
@@ -72,12 +73,16 @@ public class GoodsSimpleInfoDao {
|
|
|
ComponentSimpleInfo component = componentDao.findOne(cmpId);
|
|
ComponentSimpleInfo component = componentDao.findOne(cmpId);
|
|
|
List<TradeGoodsSimpleInfo> tradeGoodsesList = tradeGoodsDao.findByCmpUuid(component.getUuid());
|
|
List<TradeGoodsSimpleInfo> tradeGoodsesList = tradeGoodsDao.findByCmpUuid(component.getUuid());
|
|
|
List<GoodsSimpleInfo> goodsesList = new ArrayList<>();
|
|
List<GoodsSimpleInfo> goodsesList = new ArrayList<>();
|
|
|
- for (TradeGoodsSimpleInfo tradeGoods : tradeGoodsesList) {
|
|
|
|
|
- StoreSimpleInfo store = null;
|
|
|
|
|
- if (tradeGoods.getStoreId() != null) {
|
|
|
|
|
- store = storeDao.findByUuid(tradeGoods.getStoreId());
|
|
|
|
|
|
|
+ if (!CollectionUtils.isEmpty(tradeGoodsesList)) {
|
|
|
|
|
+ for (TradeGoodsSimpleInfo tradeGoods : tradeGoodsesList) {
|
|
|
|
|
+ StoreSimpleInfo store = null;
|
|
|
|
|
+ if (tradeGoods.getStoreId() != null) {
|
|
|
|
|
+ store = storeDao.findByUuid(tradeGoods.getStoreId());
|
|
|
|
|
+ }
|
|
|
|
|
+ goodsesList.add(new GoodsSimpleInfo(tradeGoods, store, component));
|
|
|
}
|
|
}
|
|
|
- goodsesList.add(new GoodsSimpleInfo(tradeGoods, store, component));
|
|
|
|
|
|
|
+ } else {
|
|
|
|
|
+ goodsesList.add(new GoodsSimpleInfo(null, null, component));
|
|
|
}
|
|
}
|
|
|
return goodsesList;
|
|
return goodsesList;
|
|
|
}
|
|
}
|