소스 검색

修复预测 EDB 信息列表未正确排序的问题

- 修改了 edb_info.go 中的查询语句,使用 edb_info_id 降序排列
- 优化了 predict_edb_rule_data.go 中的查询参数处理
- 增加了 predict_edb_info.go 中的额外条件检查,以确保结果的有效性
Roc 6 달 전
부모
커밋
2f097605cd
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      controllers/data_manage/line_equation/line_chart_info.go
  2. 3 3
      controllers/data_manage/line_feature/chart_info.go

+ 1 - 1
controllers/data_manage/line_equation/line_chart_info.go

@@ -417,7 +417,7 @@ func (this *LineEquationChartInfoController) Move() {
 			br.ErrMsg = "移动失败,Err:" + tmpErr.Error()
 			br.ErrMsg = "移动失败,Err:" + tmpErr.Error()
 			return
 			return
 		}
 		}
-		if tmpChartInfo != nil {
+		if tmpChartInfo != nil && tmpChartInfo.ChartInfoId > 0 {
 			br.Msg = "移动失败,同一个分类下图表名称不允许重复"
 			br.Msg = "移动失败,同一个分类下图表名称不允许重复"
 			br.ErrMsg = "移动失败,同一个分类下图表名称不允许重复"
 			br.ErrMsg = "移动失败,同一个分类下图表名称不允许重复"
 			return
 			return

+ 3 - 3
controllers/data_manage/line_feature/chart_info.go

@@ -878,7 +878,7 @@ func CopyMultipleGraphConfigSaveChart(req request.SaveMultipleGraphChartReq, thi
 		return
 		return
 	}
 	}
 	// 说明图还在,没有被删除
 	// 说明图还在,没有被删除
-	if oldChartInfo == nil {
+	if oldChartInfo == nil || oldChartInfo.ChartInfoId <= 0 {
 		br.Msg = "原图不存在"
 		br.Msg = "原图不存在"
 		br.IsSendEmail = false
 		br.IsSendEmail = false
 	}
 	}
@@ -1070,7 +1070,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphConfigSaveEdb() {
 	err = nil
 	err = nil
 	var isAdd bool
 	var isAdd bool
 	var edbInfoId int
 	var edbInfoId int
-	if multipleGraphConfigEdbMapping == nil {
+	if multipleGraphConfigEdbMapping == nil || multipleGraphConfigEdbMapping.MultipleGraphConfigId <= 0 {
 		isAdd = true
 		isAdd = true
 	} else {
 	} else {
 		edbInfo, err := data_manage.GetEdbInfoById(multipleGraphConfigEdbMapping.EdbInfoId)
 		edbInfo, err := data_manage.GetEdbInfoById(multipleGraphConfigEdbMapping.EdbInfoId)
@@ -1080,7 +1080,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphConfigSaveEdb() {
 			return
 			return
 		}
 		}
 		// 说明指标还在,没有被删除
 		// 说明指标还在,没有被删除
-		if edbInfo != nil && !req.IsSaveAs {
+		if edbInfo.EdbInfoId > 0 && !req.IsSaveAs {
 			edbInfoId = multipleGraphConfigEdbMapping.EdbInfoId
 			edbInfoId = multipleGraphConfigEdbMapping.EdbInfoId
 			req.EdbName = edbInfo.EdbName
 			req.EdbName = edbInfo.EdbName
 			req.ClassifyId = edbInfo.ClassifyId
 			req.ClassifyId = edbInfo.ClassifyId