|
@@ -88,7 +88,7 @@ public class ExcelService {
|
|
List<Brand> list1 = brandService.list();
|
|
List<Brand> list1 = brandService.list();
|
|
List<OutlineUploadTemplate> OutlineUploadTemplateList = new ArrayList<>();
|
|
List<OutlineUploadTemplate> OutlineUploadTemplateList = new ArrayList<>();
|
|
for (Brand brand : list1) {
|
|
for (Brand brand : list1) {
|
|
- OutlineUploadTemplate template = new OutlineUploadTemplate(brand.getOutlineId().toString(),brand.getCdfBrandId());
|
|
|
|
|
|
+ OutlineUploadTemplate template = new OutlineUploadTemplate(brand.getOutlineId()==null?"":brand.getOutlineId().toString(),brand.getCdfBrandId());
|
|
OutlineUploadTemplateList.add(template);
|
|
OutlineUploadTemplateList.add(template);
|
|
}
|
|
}
|
|
|
|
|