Переглянути джерело

图表ID和指标ID保持一致

xyxie 2 тижнів тому
батько
коміт
0a5e0f80bb
2 змінених файлів з 13 додано та 10 видалено
  1. 12 10
      services/chart_info.go
  2. 1 0
      services/edb_info.go

+ 12 - 10
services/chart_info.go

@@ -110,7 +110,7 @@ func AddChartInfo(req *models.AddChartReq, sysUserId int, sysUserRealName string
 			chartInfo.UploadUserRealName = uploader.RealName
 		}
 	}
-
+	chartInfo.ChartInfoId = req.ChartInfo.ChartInfoId
 	chartInfo.ChartName = req.ChartInfo.ChartName
 	chartInfo.ChartClassifyId = req.ChartInfo.ChartClassifyId
 	chartInfo.EdbInfoIds = edbInfoIdStr
@@ -769,15 +769,17 @@ func addOrUpdateChartDescriptionList(chartInfoId int, reqDescription []*models.C
 	for _, v := range reqDescription {
 		adminNames = append(adminNames, v.AdminName)
 	}
-	adminList, e := system.GetAdminListByAdminName(adminNames)
-	if e != nil {
-		errMsg = "获取创建人信息失败"
-		err = errors.New("获取创建人信息失败,Err:" + e.Error())
-		return
-	}
-	for _, v := range reqDescription {
-		for _, admin := range adminList {
-			oldAdminIdMap[v.AdminName] = admin.AdminId
+	if len(adminNames) > 0 {
+		adminList, e := system.GetAdminListByAdminName(adminNames)
+		if e != nil {
+			errMsg = "获取创建人信息失败"
+			err = errors.New("获取创建人信息失败,Err:" + e.Error())
+			return
+		}
+		for _, v := range reqDescription {
+			for _, admin := range adminList {
+				oldAdminIdMap[v.AdminName] = admin.AdminId
+			}
 		}
 	}
 	

+ 1 - 0
services/edb_info.go

@@ -147,6 +147,7 @@ func AddOrUpdateEdbInfo(edbItem *models.EdbInfo, sysUserId int, sysUserRealName
 		}
 	} else {
 		edbInfo = new(models.EdbInfo)
+		edbInfo.EdbInfoId = edbItem.EdbInfoId
 		edbInfo.Source = edbItem.Source
 		edbInfo.SourceName = edbItem.SourceName
 		edbInfo.EdbType = edbItem.EdbType