Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

This commit is contained in:
laodaming 2023-09-12 17:55:30 +08:00
commit 6e42d9d218

View File

@ -264,8 +264,21 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
logx.Error(err)
return nil, err
}
materialList = templateInfo["materialList"].([]interface{})
groupOptions = templateInfo["groupOptions"].(map[string]interface{})
mapMaterialList, existMaterialList := templateInfo["materialList"]
if !existMaterialList {
err = errors.New("materialList is null")
logc.Errorf(ctx, "materialList err%v", err)
return nil, err
}
materialList = mapMaterialList.([]interface{})
mapGroupOptions, existGroupOptions := templateInfo["groupOptions"]
if !existGroupOptions {
err = errors.New("groupOptions is null")
logc.Errorf(ctx, "groupOptions err%v", err)
return nil, err
}
groupOptions = mapGroupOptions.(map[string]interface{})
}
var moduleDataMap = make(map[string]interface{}, 4)