Merge remote-tracking branch 'origin/master'

# Conflicts:
#	soss-system/src/main/java/com/soss/system/service/impl/MachineApiServiceImpl.java

soss-system/src/main/java/com/soss/system/service/impl/MachineApiServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.*;
@@ -71,9 +72,10 @@ public class MachineApiServiceImpl {
         for (String skuId : skuIds) {
             shopGoodsSku.setSkuId(Long.parseLong(skuId));
             List<ShopGoodsSku> shopGoodsSkus = shopGoodsSkuMapper.selectShopGoodsSkuList(shopGoodsSku);
-            if(shopGoodsSkus.isEmpty()){
-                log.info("当前sku【{}】不存在",skuId);
-                //throw new ServiceException(skuId+"不存在");
+            if(CollectionUtils.isEmpty(shopGoodsSkus)){
+                log.info(skuId+"不存在");
+                continue;
+//                throw new ServiceException(skuId+"不存在");
             }
             for (ShopGoodsSku goodsSkus : shopGoodsSkus) {
                 Long goodsId = goodsSkus.getGoodsId();