1

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

@@ -74,17 +74,11 @@ 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())){
-
+            if(brand != null &&
+                    MyStringUtils.eqStr(brand.getZhName(),cdfBrand.getBrand_name()) &&
+                    MyStringUtils.eqStr(brand.getFtName(),cdfBrand.getBrand_tc_name()) &&
+                    MyStringUtils.eqStr(brand.getEnName(),cdfBrand.getBrand_en_name()) &&
+                    MyStringUtils.eqStr(brand.getBrandLogo(),cdfBrand.getLogo())){
                 continue;
             }