|
|
@@ -545,7 +545,12 @@ public class GoodsDescController extends BladeController {
|
|
|
item.setSharedCompanyName(pjProductLaunch.getSourceCompanyName());
|
|
|
item.setInventory(pjProductLaunch.getInventory());
|
|
|
}
|
|
|
- String typeIds = item.getGoodsTypeId();
|
|
|
+ String typeIds;
|
|
|
+ if (ObjectUtils.isNotNull(item.getGoodsTypeId())){
|
|
|
+ typeIds = item.getGoodsTypeId();
|
|
|
+ }else{
|
|
|
+ typeIds = "";
|
|
|
+ }
|
|
|
String[] typeIdsArry = typeIds.split(",");
|
|
|
List<String> typeList = Arrays.asList(typeIdsArry);
|
|
|
List<PjGoodsType> types = pjGoodsTypeList.stream().filter(e -> typeList.contains(e.getId() + "")).collect(Collectors.toList());
|
|
|
@@ -785,7 +790,12 @@ public class GoodsDescController extends BladeController {
|
|
|
item.setSharedCompanyName(pjProductLaunch.getSourceCompanyName());
|
|
|
item.setInventory(pjProductLaunch.getInventory());
|
|
|
}
|
|
|
- String typeIds = item.getGoodsTypeId();
|
|
|
+ String typeIds;
|
|
|
+ if (ObjectUtils.isNotNull(item.getGoodsTypeId())){
|
|
|
+ typeIds = item.getGoodsTypeId();
|
|
|
+ }else{
|
|
|
+ typeIds = "";
|
|
|
+ }
|
|
|
String[] typeIdsArry = typeIds.split(",");
|
|
|
List<String> typeList = Arrays.asList(typeIdsArry);
|
|
|
List<PjGoodsType> types = pjGoodsTypeList.stream().filter(e -> typeList.contains(e.getId() + "")).collect(Collectors.toList());
|