Browse Source

提交代码

pull/2758/head
ychao_1983 2 years ago
parent
commit
a9d3810e5f
2 changed files with 15 additions and 14 deletions
  1. +14
    -13
      models/dataset_reference.go
  2. +1
    -1
      routers/repo/dataset.go

+ 14
- 13
models/dataset_reference.go View File

@@ -51,15 +51,15 @@ func getReferenceDatasetStr(repoID int64) string {
return "" return ""
} }


func deleteDatasetIdsByRepoID(repoID int64) error {
func DeleteReferenceDatasetIdsByRepoID(repoID int64) error {


_, err := x.Where("repo_id", repoID).Delete(new(DatasetReference))
_, err := x.Exec("delete from dataset_reference where repo_id=?", repoID)
return err return err
} }


func NewDatasetIdsByRepoID(repoID int64, datasetIds []int64) error { func NewDatasetIdsByRepoID(repoID int64, datasetIds []int64) error {
if len(datasetIds) == 0 { //关联数据集数组为空,不需要处理
return nil
if len(datasetIds) == 0 { //关联数据集数组为空
DeleteReferenceDatasetIdsByRepoID(repoID)
} }
var datasetsStrArray []string var datasetsStrArray []string
for _, datasetId := range datasetIds { for _, datasetId := range datasetIds {
@@ -72,16 +72,17 @@ func NewDatasetIdsByRepoID(repoID int64, datasetIds []int64) error {
return nil return nil
} }
if oldDatasetStr != "" { //已经存在关联数据集 if oldDatasetStr != "" { //已经存在关联数据集
err := deleteDatasetIdsByRepoID(repoID)
if err != nil {
return err
_, err := x.Exec("update dataset_reference set dataset_id=? where repo_id=?", newDatasetStr, repoID)

return err
} else {
datasetReference := DatasetReference{
DatasetID: newDatasetStr,
RepoID: repoID,
} }
}
datasetReference := DatasetReference{
DatasetID: newDatasetStr,
RepoID: repoID,

_, err := x.Insert(datasetReference)
return err
} }


_, err := x.Insert(datasetReference)
return err
} }

+ 1
- 1
routers/repo/dataset.go View File

@@ -280,7 +280,7 @@ func ReferenceDatasetDelete(ctx *context.Context) {


for _, tempDatasetId := range oldDatasetIds { for _, tempDatasetId := range oldDatasetIds {
if datasetId != tempDatasetId { if datasetId != tempDatasetId {
newDatasetIds = append(newDatasetIds, datasetId)
newDatasetIds = append(newDatasetIds, tempDatasetId)
} }
} }
err := models.NewDatasetIdsByRepoID(repoID, newDatasetIds) err := models.NewDatasetIdsByRepoID(repoID, newDatasetIds)


Loading…
Cancel
Save