。。

models/chart_info.go

@@ -224,6 +224,7 @@ func DeleteChartInfoAndData(chartInfoId int) (err error) {
 	}
 	sql = ` DELETE FROM  chart_edb_mapping WHERE chart_info_id=? `
 	_, err = to.Raw(sql, chartInfoId).Exec()
+
 	return
 }
 

models/chart_series.go

@@ -31,7 +31,7 @@ func (c *ChartSeries) TableName() string {
 }
 
 func GetChartSeriesByChartInfoId(chartInfoId int) (items []*ChartSeries, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := "SELECT * FROM chart_series WHERE chart_info_id = ?"
 	_, err = o.Raw(sql, chartInfoId).QueryRows(&items)
 	return
@@ -39,7 +39,7 @@ func GetChartSeriesByChartInfoId(chartInfoId int) (items []*ChartSeries, err err
 
 // EditChartSeriesAndEdbMapping
 func EditChartSeriesAndEdbMapping(seriesList []*ChartSeries, seriesEdbInfoList []*ChartSeriesEdbMapping, chartInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -162,7 +162,7 @@ func EditChartSeriesAndEdbMapping(seriesList []*ChartSeries, seriesEdbInfoList [
 }
 
 func AddChartSeriesAndEdbMapping(seriesList []*ChartSeries, seriesEdbInfoList []*ChartSeriesEdbMapping, chartInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -237,7 +237,7 @@ func AddChartSeriesAndEdbMapping(seriesList []*ChartSeries, seriesEdbInfoList []
 }
 
 func DeleteChartSeriesAndEdbMapping(chartInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	to, err := o.Begin()
 	if err != nil {
 		return

models/chart_series_edb_mapping.go

@@ -24,7 +24,7 @@ func (c *ChartSeriesEdbMapping) TableName() string {
 }
 
 func GetChartSeriesEdbByChartInfoId(chartInfoId int) (items []*ChartSeriesEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := "SELECT * FROM chart_series_edb_mapping WHERE chart_info_id = ?"
 	_, err = o.Raw(sql, chartInfoId).QueryRows(&items)
 	return

services/chart_info.go

@@ -587,7 +587,14 @@ func DeleteChart(chartInfoId int) (err error, errMsg string) {
 		err = fmt.Errorf("删除图表数据失败, Err:" + err.Error())
 		return
 	}
-
+	if chartInfo.ChartType == utils.CHART_TYPE_SECTION_COMBINE {
+		err = models.DeleteChartSeriesAndEdbMapping(chartInfo.ChartInfoId)
+		if err != nil {
+			errMsg = "删除失败"
+			err = fmt.Errorf("删除图表系列数据失败, Err:" + err.Error())
+			return
+		}
+	}
 	err, errMsg = BatchDeleteEdbInfo(edbInfoIds)
 	if err != nil {
 		errMsg = "删除失败"