Merge branch 'sxy' into dev

This commit is contained in:
孙肖扬 2025-06-12 11:41:22 +08:00
commit 4e718554b8

View File

@ -321,7 +321,7 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *bundle.BundleDetailRe
if err != nil { if err != nil {
res.Msg = err.Error() res.Msg = err.Error()
} }
if detail != nil && detail.BundleProfileLang != nil && len(detail.BundleProfileLang) > 0 { if detail != nil {
bundleProfile.Uuid = detail.UUID bundleProfile.Uuid = detail.UUID
bundleProfile.Name = detail.Name bundleProfile.Name = detail.Name
bundleProfile.Content = detail.Content bundleProfile.Content = detail.Content
@ -343,6 +343,7 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *bundle.BundleDetailRe
selectValueAddServices = append(selectValueAddServices, selectValueAddService) selectValueAddServices = append(selectValueAddServices, selectValueAddService)
} }
} }
if detail.BundleProfileLang != nil && len(detail.BundleProfileLang) > 0 {
for _, lang := range detail.BundleProfileLang { for _, lang := range detail.BundleProfileLang {
bundleProfileLang := &bundle.BundleProfileLang{ bundleProfileLang := &bundle.BundleProfileLang{
Uuid: lang.UUID, Uuid: lang.UUID,
@ -385,6 +386,7 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *bundle.BundleDetailRe
bundleProfileLangs = append(bundleProfileLangs, bundleProfileLang) bundleProfileLangs = append(bundleProfileLangs, bundleProfileLang)
} }
} }
}
if selectValueAddServices != nil && len(selectValueAddServices) > 0 { if selectValueAddServices != nil && len(selectValueAddServices) > 0 {
bundleProfile.SelectValueAddService = selectValueAddServices bundleProfile.SelectValueAddService = selectValueAddServices