Merge remote-tracking branch 'origin/mark' into su

2020-03-24 10:58:50 +08:00
parent 5664baf3ef b3659d260d
commit 1922939b5a
10 changed files with 337 additions and 93 deletions
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -3210,6 +3210,9 @@ func AutoFocusStoreSkusForTopSkus(ctx *jxcontext.Context, isAsync, isContinueWhe
 					skuName    []*model.SkuName
 					skuNameMap = make(map[int]int)
 				)
+				if v.ID == model.MatterStoreID {
+					return retVal, err
+				}
 				sql := `
 					SELECT DISTINCT a.name_id id
 					FROM sku a