|
@@ -64,7 +64,15 @@ public class BrandServiceImpl extends ServiceImpl<IBrandMapper, Brand> implement
|
|
|
brandHashMap.put(brand.getCdfBrandId(),brand);
|
|
|
}
|
|
|
List<Brand> saveList = new ArrayList<>();
|
|
|
+ HashMap<String,CdfBrand> cdfBrandHashMap = new HashMap<>();
|
|
|
for (CdfBrand cdfBrand : allBrand) {
|
|
|
+ cdfBrandHashMap.put(cdfBrand.getBrand_id(),cdfBrand);
|
|
|
+ }
|
|
|
+ for (String brandId : cdfBrandHashMap.keySet()) {
|
|
|
+ CdfBrand cdfBrand = cdfBrandHashMap.get(brandId);
|
|
|
+ if(cdfBrand == null){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
Brand brand = brandHashMap.get(cdfBrand.getBrand_id());
|
|
|
if(brand == null){
|
|
|
brand = new Brand();
|