yonge пре 3 година
родитељ
комит
df7c9d82cf

+ 16 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectChangeServiceImpl.java

@@ -507,8 +507,22 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
             }
 
             subjectChange.setOriginalAccessories(accessoriesId);
-            List<Goods> accessoriesGoods = goodsDao.findGoodsByIds(accessoriesId);
-            subjectChange.setOriginalAccessoriesGoods(accessoriesGoods);
+            
+            Map<Integer, Goods> goodsMap = goodsService.findGoodsByIds(accessoriesId).stream().collect(Collectors.toMap(Goods::getId, Goods -> Goods));
+
+			String[] accessoriesIdList = StringUtils.split(accessoriesId, ',');
+
+			for (String s : accessoriesIdList) {
+				if(StringUtils.isBlank(s)){
+					continue;
+				}
+				
+				if(subjectChange.getOriginalAccessoriesGoods() == null){
+					subjectChange.setOriginalAccessoriesGoods(new ArrayList<Goods>());
+				}
+				subjectChange.getOriginalAccessoriesGoods().add(goodsMap.get(Integer.parseInt(s)));
+			}
+            
             //BigDecimal price = accessoriesGoods.stream().map(Goods::getGroupPurchasePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
             subjectChange.setOriginalAccessoriesPrice(accessoriesPrice);
         }