1

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

@@ -15,6 +15,7 @@ import com.cdf.response.BrandApiVo;
 import com.cdf.service.IBrandService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cdf.service.IHotOutlineService;
+import com.cdf.util.MyStringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,17 +75,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;
             }
 

src/main/java/com/cdf/util/MyStringUtils.java

@@ -0,0 +1,17 @@
+package com.cdf.util;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class MyStringUtils {
+
+    public static boolean eqStr(String a ,String b){
+        if(StringUtils.isBlank(a) && StringUtils.isBlank(b)){
+            return true;
+        }
+        if(StringUtils.isBlank(a) || StringUtils.isBlank(b)){
+            return false;
+        }
+        return a.equals(b);
+    }
+
+}