|
@@ -374,7 +374,7 @@ func UpdateChartInfoAndEdbInfo(req *models.AddChartReq, sysUserId int, sysUserRe
|
|
|
oldMappingIdMap := make(map[string]*models.ChartEdbMapping)
|
|
|
removeMapping := make(map[int]struct{})
|
|
|
for _, v := range oldChartEdbMappingList {
|
|
|
- name := fmt.Sprintf("%s-%s", v.EdbCode, v.Source)
|
|
|
+ name := fmt.Sprintf("%s-%d", v.EdbCode, v.Source)
|
|
|
oldMappingIdMap[name] = v
|
|
|
removeMapping[v.ChartEdbMappingId] = struct{}{}
|
|
|
}
|
|
@@ -398,7 +398,7 @@ func UpdateChartInfoAndEdbInfo(req *models.AddChartReq, sysUserId int, sysUserRe
|
|
|
return
|
|
|
}
|
|
|
// 判断是否已经存在映射关系
|
|
|
- existName := fmt.Sprintf("%s-%s", edbCode, v.Source)
|
|
|
+ existName := fmt.Sprintf("%s-%d", edbCode, v.Source)
|
|
|
if oldMapping, ok1 := oldMappingIdMap[existName]; ok1 {
|
|
|
//更新映射关系
|
|
|
mapItem = oldMapping
|
|
@@ -471,11 +471,10 @@ func UpdateChartInfoAndEdbInfo(req *models.AddChartReq, sysUserId int, sysUserRe
|
|
|
// 删除原先的绑定关系
|
|
|
if len(removeMapping) > 0 {
|
|
|
removeIdList := make([]string, 0) //需要移除的日期
|
|
|
- for _, v := range removeMapping {
|
|
|
- removeIdList = append(removeIdList, fmt.Sprint(v))
|
|
|
+ for k, _ := range removeMapping {
|
|
|
+ removeIdList = append(removeIdList, fmt.Sprint(k))
|
|
|
}
|
|
|
removeIdStr := strings.Join(removeIdList, `","`)
|
|
|
- removeIdStr = `"` + removeIdStr + `"`
|
|
|
err = models.DeleteChartEdbMappingByChartEdbMappingId(removeIdStr)
|
|
|
if err != nil {
|
|
|
errMsg = `删除失败`
|