|
|
@@ -1054,27 +1054,26 @@ public class ProductServiceImpl implements ProductService {
|
|
|
return map;
|
|
|
}
|
|
|
Long enuu = null;
|
|
|
- for (Long id : productIds) {
|
|
|
+ List<Long> pids = productDao.findProductIdInProductUsers(productIds);
|
|
|
+ for (Long id : pids) {
|
|
|
Product product = productDao.findOne(id);
|
|
|
if (product != null) {
|
|
|
enuu = product.getEnUU();
|
|
|
break;
|
|
|
- } else {
|
|
|
- System.err.println(id + "----------------------------");
|
|
|
}
|
|
|
}
|
|
|
//筛选已经存在个人物料库的信息
|
|
|
- if (!CollectionUtils.isEmpty(productIds)) {
|
|
|
- List<Long> productIdInProductPerson = productUsersDao.findProductIdInProductUsers(productIds, userUU);
|
|
|
+ if (!CollectionUtils.isEmpty(pids)) {
|
|
|
+ List<Long> productIdInProductPerson = productUsersDao.findProductIdInProductUsers(pids, userUU);
|
|
|
for (Long productid : productIdInProductPerson) {
|
|
|
- productIds.remove(productid);
|
|
|
+ pids.remove(productid);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
//转成需要保存的信息
|
|
|
List<ProductUsers> list = new ArrayList<>();
|
|
|
ProductUsers productUsers = null;
|
|
|
- for (Long prId : productIds) {
|
|
|
+ for (Long prId : pids) {
|
|
|
productUsers = new ProductUsers(enuu, userUU, prId);
|
|
|
list.add(productUsers);
|
|
|
}
|