|
|
@@ -643,17 +643,19 @@ public class ProductServiceImpl implements ProductService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- List<ProductPerson> productPersons = productPersonDao.findByProductIds(ids);
|
|
|
- for (ProductPerson productPerson : productPersons) {
|
|
|
- if (!message.contains("存在物料已被个人收录,不能删除")) {
|
|
|
- if (org.apache.commons.lang.StringUtils.isNotEmpty(message)) {
|
|
|
- message += ",";
|
|
|
+ if (CollectionUtils.isNotEmpty(ids)) {
|
|
|
+ List<ProductPerson> productPersons = productPersonDao.findByProductIds(ids);
|
|
|
+ for (ProductPerson productPerson : productPersons) {
|
|
|
+ if (!message.contains("存在物料已被个人收录,不能删除")) {
|
|
|
+ if (org.apache.commons.lang.StringUtils.isNotEmpty(message)) {
|
|
|
+ message += ",";
|
|
|
+ }
|
|
|
+ message += "存在物料已被个人收录,不能删除";
|
|
|
}
|
|
|
- message += "存在物料已被个人收录,不能删除";
|
|
|
+ StringUtilB2C.removeFromList(ids, productPerson.getProductId());
|
|
|
}
|
|
|
- StringUtilB2C.removeFromList(ids, productPerson.getProductId());
|
|
|
}
|
|
|
+
|
|
|
if (CollectionUtils.isNotEmpty(ids)) {
|
|
|
//删除匹配结果信息
|
|
|
productMatchResultDao.deleteByProductids(ids);
|