Merge branch 'sxy' into dev
This commit is contained in:
commit
4e718554b8
@ -321,7 +321,7 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *bundle.BundleDetailRe
|
||||
if err != nil {
|
||||
res.Msg = err.Error()
|
||||
}
|
||||
if detail != nil && detail.BundleProfileLang != nil && len(detail.BundleProfileLang) > 0 {
|
||||
if detail != nil {
|
||||
bundleProfile.Uuid = detail.UUID
|
||||
bundleProfile.Name = detail.Name
|
||||
bundleProfile.Content = detail.Content
|
||||
@ -343,6 +343,7 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *bundle.BundleDetailRe
|
||||
selectValueAddServices = append(selectValueAddServices, selectValueAddService)
|
||||
}
|
||||
}
|
||||
if detail.BundleProfileLang != nil && len(detail.BundleProfileLang) > 0 {
|
||||
for _, lang := range detail.BundleProfileLang {
|
||||
bundleProfileLang := &bundle.BundleProfileLang{
|
||||
Uuid: lang.UUID,
|
||||
@ -385,6 +386,7 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *bundle.BundleDetailRe
|
||||
bundleProfileLangs = append(bundleProfileLangs, bundleProfileLang)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if selectValueAddServices != nil && len(selectValueAddServices) > 0 {
|
||||
bundleProfile.SelectValueAddService = selectValueAddServices
|
||||
|
Loading…
Reference in New Issue
Block a user