Merge branch 'sxy' into dev
This commit is contained in:
commit
fa6d5bd4c3
@ -175,7 +175,7 @@ func BatchValueAddServiceDetailTx(tx *gorm.DB, uids []string) (map[string]*model
|
|||||||
}
|
}
|
||||||
var results []*model.ValueAddService
|
var results []*model.ValueAddService
|
||||||
err := tx.Model(&model.ValueAddService{}).
|
err := tx.Model(&model.ValueAddService{}).
|
||||||
Where("value_uid IN ? AND deleted_at = 0", uids).
|
Where("uuid IN ? AND deleted_at = 0", uids).
|
||||||
Preload("ValueAddServiceLang", "deleted_at = 0").
|
Preload("ValueAddServiceLang", "deleted_at = 0").
|
||||||
Find(&results).Error
|
Find(&results).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -215,7 +215,7 @@ func SaveBundle(req *bundle.BundleProfile) (res *bundle.SaveResponse, err error)
|
|||||||
} else { // 已存在,进行更新
|
} else { // 已存在,进行更新
|
||||||
|
|
||||||
// 更新前保存历史记录
|
// 更新前保存历史记录
|
||||||
if saveErr := saveBundleHistory(tx, req.Uuid, "", 0); err != nil {
|
if saveErr := saveBundleHistory(tx, req.Uuid, "", 0); saveErr != nil {
|
||||||
return res, saveErr
|
return res, saveErr
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user