Browse Source

fix:修复批量删除bug

zqbao 7 months ago
parent
commit
51865caf58
2 changed files with 6 additions and 2 deletions
  1. 1 1
      models/data_manage/base_from_sci_hq_index.go
  2. 5 1
      services/data/base_from_sci_hq.go

+ 1 - 1
models/data_manage/base_from_sci_hq_index.go

@@ -18,7 +18,7 @@ type BaseFromSciHqIndex struct {
 	EndDate              string
 	Sort                 int
 	TerminalCode         string
-	FilePath             string
+	FilePath             string `json:"-"`
 	CreateTime           time.Time
 	ModifyTime           time.Time
 }

+ 5 - 1
services/data/base_from_sci_hq.go

@@ -202,15 +202,19 @@ func BatchDelSciHqData(indexIds []int) (existIndex []*data_manage.BaseFromSciHqI
 	if err != nil {
 		return
 	}
+	deleteIndexIds := make([]int, 0)
 	for _, v := range edbInfoList {
 		if index, ok := codeToIndex[v.EdbCode]; ok {
 			existIndex = append(existIndex, index)
 			delete(codeToIndex, v.EdbCode)
 		}
 	}
+	for _, v := range codeToIndex {
+		deleteIndexIds = append(deleteIndexIds, v.BaseFromSciHqIndexId)
+	}
 
 	// 删除对应的指标
-	err = data_manage.DeleteSciHqIndexByIds(indexIds)
+	err = data_manage.DeleteSciHqIndexByIds(deleteIndexIds)
 	if err != nil {
 		return
 	}