批量导入问题的处理

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9846 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/service/impl/BaseInfoServiceImpl.java

@@ -157,7 +157,8 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 					// 最小包装量
 					if (row.getCell(5) != null) {
 						row.getCell(5).setCellType(Cell.CELL_TYPE_STRING);
-						if (null != row.getCell(5).getStringCellValue()) {
+						if (null != row.getCell(5).getStringCellValue()
+								&& !row.getCell(5).getStringCellValue().trim().equals("")) {
 							product.setMinPack(Float.valueOf(row.getCell(5).getStringCellValue()));
 						}
 					}
@@ -505,7 +506,9 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		if (productDao.exists(id)) {
 			// 先删除匹配结果的id
 			List<ProductMatchResult> results = productMatchResultDao.findByPrid(id);
-			productMatchResultDao.delete(results);
+			if (!CollectionUtils.isEmpty(results)) {
+				productMatchResultDao.delete(results);
+			}
 			productDao.delete(id);
 		}
 	}

src/main/java/com/uas/platform/b2b/service/impl/PurcProductServiceImpl.java

@@ -89,6 +89,8 @@ public class PurcProductServiceImpl implements PurcProductService {
 					// 最小包装量
 					if (row.getCell(5) != null) {
 						row.getCell(5).setCellType(Cell.CELL_TYPE_STRING);
+						if (null != row.getCell(5).getStringCellValue().trim()
+								&& !row.getCell(5).getStringCellValue().trim().equals(""))
 						product.setMinPack(Float.valueOf(row.getCell(5).getStringCellValue()));
 					}
 					// 最小订购量