1

src/main/java/com/cdf/service/impl/BrandServiceImpl.java

@@ -74,6 +74,20 @@ public class BrandServiceImpl extends ServiceImpl<IBrandMapper, Brand> implement
                 continue;
             }
             Brand brand = brandHashMap.get(cdfBrand.getBrand_id());
+            if(brand != null && StringUtils.isNotBlank(brand.getZhName()) && StringUtils.isNotBlank(brand.getFtName())
+                    && StringUtils.isNotBlank(brand.getEnName()) && StringUtils.isNotBlank(brand.getBrandLogo()) &&
+
+                    StringUtils.isNotBlank(cdfBrand.getBrand_tc_name()) && StringUtils.isNotBlank(cdfBrand.getBrand_en_name())
+                    && StringUtils.isNotBlank(cdfBrand.getBrand_name()) && StringUtils.isNotBlank(cdfBrand.getLogo()) &&
+
+                    brand.getZhName().equals(cdfBrand.getBrand_name())
+                    && brand.getFtName().equals(cdfBrand.getBrand_tc_name())
+                    && brand.getEnName().equals(cdfBrand.getBrand_en_name())
+                    && brand.getBrandLogo().equals(cdfBrand.getLogo())){
+
+                continue;
+            }
+
             if(brand == null){
                 brand = new Brand();
                 brand.setCdfBrandId(cdfBrand.getBrand_id());
@@ -202,4 +216,6 @@ public class BrandServiceImpl extends ServiceImpl<IBrandMapper, Brand> implement
         wrapper.eq(Brand::getOutlineId,outlineId);
         return this.list(wrapper);
     }
+
+
 }