|
@@ -132,10 +132,10 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
|
|
|
if(businessItemProduct.getProductId().equals(product.getId())){
|
|
|
businessItemProduct.setProductName(product.getProductName());
|
|
|
for (SysDict sysDict : sysDicts) {
|
|
|
- if (product.getType().equals(sysDict.getId())){
|
|
|
+ if (product.getType()!=null&&product.getType().equals(sysDict.getId())){
|
|
|
businessItemProduct.setProductType(sysDict.getName());
|
|
|
}
|
|
|
- if (product.getUnit().equals(sysDict.getId())){
|
|
|
+ if (product.getUnit()!=null&&product.getUnit().equals(sysDict.getId())){
|
|
|
businessItemProduct.setUnit(sysDict.getName());
|
|
|
}
|
|
|
}
|