diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 8a8ef88a1..310cd8a00 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -249,6 +249,9 @@ func DeleteConfig(ctx *jxcontext.Context, key, configType string) (err error) { } func UpdateConfig(ctx *jxcontext.Context, key, configType, value string) (err error) { + if key == "" { + return fmt.Errorf("修改配置必须给定key") + } if err = checkConfig(configType, value); err != nil { return err } diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 64b95590e..9df379453 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -793,9 +793,11 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor } valid := dao.StrictMakeMapByStructObject(payload, storeMap, userName) if valid["pricePercentagePack"] != nil { - _, err2 := dao.QueryConfigs(db, model.ConfigTypePricePack, utils.Interface2String(valid["pricePercentagePack"]), "") - if err = err2; err != nil { - return 0, err + if pricePercentagePack := utils.Interface2String(valid["pricePercentagePack"]); pricePercentagePack != "" { + _, err2 := dao.QueryConfigs(db, model.ConfigTypePricePack, pricePercentagePack, "") + if err = err2; err != nil { + return 0, err + } } } if vendorStoreID := utils.Interface2String(valid["vendorStoreID"]); vendorStoreID != "" { diff --git a/business/model/dao/new_config.go b/business/model/dao/new_config.go index 83c2620d1..760b44da5 100644 --- a/business/model/dao/new_config.go +++ b/business/model/dao/new_config.go @@ -31,7 +31,7 @@ func QueryConfigs(db *DaoDB, key, configType, keyword string) (configList []*mod } err = GetRows(db, &configList, sql, sqlParams...) - if err == nil && len(configList) == 0 { + if err == nil && len(configList) == 0 && key != "" { err = fmt.Errorf("条件:key:%s,type:%s,keyword:%s不能找到配置", key, configType, keyword) } return configList, err