Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ms-biz/src/main/java/com/ms/api/task/ProcessProductPublishTaskService.java

ms-biz/src/main/java/com/ms/api/task/ProcessProductPublishTaskService.java

@@ -78,8 +78,6 @@ import com.ms.api.service.MoveCollectTaskService;
 import com.ms.api.service.MoveProductPublishBufferService;
 import com.ms.api.service.MoveProductPublishQueueService;
 import com.ms.api.service.MoveProductPublishToPicQueueService;
-import com.ms.api.service.MoveShopConfigService;
-import com.ms.api.service.MoveShopSettingService;
 import com.ms.api.service.RsyncCategoryQueueService;
 import com.ms.api.service.Shop1688DsAuthService;
 import com.ms.api.service.ShopService;
@@ -87,7 +85,6 @@ import com.ms.api.tool.CommonTool;
 import com.ms.api.tool.DsJsonRequestTemplate;
 import com.ms.api.tool.ImageTool;
 import com.ms.api.tool.MoveTool;
-import com.ms.api.tool.SecurityTool;
 import com.ms.api.tool.TailorImgTool;
 import com.ms.api.util.DdRequestUtil;
 import com.ms.api.util.MoveUtil;
@@ -101,7 +98,6 @@ import com.ms.dal.entity.MoveProductPublishBuffer;
 import com.ms.dal.entity.MoveProductPublishQueue;
 import com.ms.dal.entity.MoveProductPublishToPicQueue;
 import com.ms.dal.entity.RsyncCategoryQueue;
-import com.ms.dal.entity.Shop;
 import com.ms.dal.entity.Shop1688DsAuth;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -1760,7 +1756,6 @@ public class ProcessProductPublishTaskService extends TaskBaseService {
 
         return price > 0 ? CommonTool.numFormat(price, 2) : CommonTool.numFormat(defaultPrice, 2);
     }
-
     public boolean checkBuildSkuCondition(String skuPropStr, String cAv, String sAv) {
         int position = skuPropStr.indexOf(";" + cAv + ";");
         boolean checkColor = (cAv.isEmpty() || position != -1);
@@ -1772,7 +1767,7 @@ public class ProcessProductPublishTaskService extends TaskBaseService {
         skuPropStr = skuPropStr.trim().replaceAll("^;+|;+$", "");
         sAv = StringUtils.isNotBlank(sAv) ? sAv.trim() : "";
         sAv = sAv.trim().replaceAll("^;+|;+$", "");
-        if (ObjectUtil.isNotEmpty(sAv) && ObjectUtil.isNotEmpty(skuPropStr)) {
+        if (ObjectUtil.isEmpty(sAv) && ObjectUtil.isEmpty(skuPropStr)) {
             checkSize = true;
         } else {
             String[] skuPropArr = skuPropStr.split(";");