图库分类删除fix

controllers/data_manage/chart_classify.go

@@ -631,7 +631,13 @@ func (this *ChartClassifyController) DeleteChartClassify() {
 			return
 		}
 
-		err = data_manage.DeleteChartClassify(req.ChartClassifyId)
+		delIds := childIds
+		if len(delIds) == 0 {
+			delIds = append(delIds, req.ChartClassifyId)
+		}
+
+		err = data_manage.DeleteChartClassifyByIds(delIds)
+		//err = data_manage.DeleteChartClassify(req.ChartClassifyId)
 		if err != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "删除失败,Err:" + err.Error()

controllers/data_manage/correlation/correlation_chart_classify.go

@@ -340,10 +340,10 @@ func (this *CorrelationChartClassifyController) DeleteChartClassifyCheck() {
 	}
 	var deleteStatus int
 	var tipsMsg string
+	childIds := make([]int, 0)
 	//删除分类
 	if req.ChartClassifyId > 0 && req.ChartInfoId == 0 {
 		//判断相关性图表分类下，是否含有图表
-		childIds := make([]int, 0)
 		classifyAll, err := data_manage.GetChartClassifyAllBySource(utils.CHART_SOURCE_CORRELATION)
 		if err != nil {
 			br.Msg = "删除失败"
@@ -384,13 +384,13 @@ func (this *CorrelationChartClassifyController) DeleteChartClassifyCheck() {
 	}
 
 	if deleteStatus != 1 && req.ChartInfoId == 0 {
-		classifyCount, err := data_manage.GetChartClassifyCountByClassifyId(req.ChartClassifyId)
-		if err != nil && !utils.IsErrNoRow(err) {
-			br.Msg = "删除失败"
-			br.ErrMsg = "分类下是否含有图表失败，Err:" + err.Error()
-			return
-		}
-		if classifyCount > 0 {
+		//classifyCount, err := data_manage.GetChartClassifyCountByClassifyId(req.ChartClassifyId)
+		//if err != nil && !utils.IsErrNoRow(err) {
+		//	br.Msg = "删除失败"
+		//	br.ErrMsg = "分类下是否含有图表失败，Err:" + err.Error()
+		//	return
+		//}
+		if len(childIds) > 0 {
 			deleteStatus = 2
 			tipsMsg = "确认删除当前目录及包含的子目录吗"
 		}
@@ -486,7 +486,13 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 			return
 		}
 
-		err = data_manage.DeleteChartClassify(req.ChartClassifyId)
+		delIds := childIds
+		if len(delIds) == 0 {
+			delIds = append(delIds, req.ChartClassifyId)
+		}
+
+		err = data_manage.DeleteChartClassifyByIds(delIds)
+		//err = data_manage.DeleteChartClassify(req.ChartClassifyId)
 		if err != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "删除失败,Err:" + err.Error()

controllers/data_manage/cross_variety/classify.go

@@ -324,7 +324,14 @@ func (c *ClassifyController) DeleteChartClassify() {
 			return
 		}
 
-		err = data_manage.DeleteChartClassify(req.ChartClassifyId)
+
+		delIds := childIds
+		if len(delIds) == 0 {
+			delIds = append(delIds, req.ChartClassifyId)
+		}
+
+		err = data_manage.DeleteChartClassifyByIds(delIds)
+		//err = data_manage.DeleteChartClassify(req.ChartClassifyId)
 		if err != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "删除失败,Err:" + err.Error()

controllers/data_manage/future_good/future_good_chart_classify.go

@@ -432,7 +432,14 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 			return
 		}
 
-		err = data_manage.DeleteChartClassify(req.ChartClassifyId)
+
+		delIds := childIds
+		if len(delIds) == 0 {
+			delIds = append(delIds, req.ChartClassifyId)
+		}
+
+		err = data_manage.DeleteChartClassifyByIds(delIds)
+		//err = data_manage.DeleteChartClassify(req.ChartClassifyId)
 		if err != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "删除失败,Err:" + err.Error()

controllers/data_manage/line_equation/line_chart_classify.go

@@ -437,7 +437,14 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 			return
 		}
 
-		err = data_manage.DeleteChartClassify(req.ChartClassifyId)
+
+		delIds := childIds
+		if len(delIds) == 0 {
+			delIds = append(delIds, req.ChartClassifyId)
+		}
+
+		err = data_manage.DeleteChartClassifyByIds(delIds)
+		//err = data_manage.DeleteChartClassify(req.ChartClassifyId)
 		if err != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "删除失败,Err:" + err.Error()

controllers/data_manage/line_feature/classify.go

@@ -437,7 +437,14 @@ func (this *LineFeaturesChartClassifyController) DeleteChartClassify() {
 			return
 		}
 
-		err = data_manage.DeleteChartClassify(req.ChartClassifyId)
+
+		delIds := childIds
+		if len(delIds) == 0 {
+			delIds = append(delIds, req.ChartClassifyId)
+		}
+
+		err = data_manage.DeleteChartClassifyByIds(delIds)
+		//err = data_manage.DeleteChartClassify(req.ChartClassifyId)
 		if err != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "删除失败,Err:" + err.Error()

controllers/data_manage/range_analysis/chart_classify.go

@@ -485,7 +485,14 @@ func (this *RangeChartClassifyController) DeleteChartClassify() {
 			return
 		}
 
-		err = data_manage.DeleteChartClassify(req.ChartClassifyId)
+
+		delIds := childIds
+		if len(delIds) == 0 {
+			delIds = append(delIds, req.ChartClassifyId)
+		}
+
+		err = data_manage.DeleteChartClassifyByIds(delIds)
+		//err = data_manage.DeleteChartClassify(req.ChartClassifyId)
 		if err != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "删除失败,Err:" + err.Error()

models/data_manage/chart_classify.go

@@ -434,3 +434,11 @@ func GetChartClassifyAllBySource(source int) (items []*ChartClassifyItems, err e
 
 	return
 }
+
+// delByIds
+func DeleteChartClassifyByIds(ids []int) (err error) {
+	o := global.DmSQL["data"]
+	sql := `DELETE FROM chart_classify WHERE chart_classify_id IN (` + utils.GetOrmInReplace(len(ids)) + `)`
+	err = o.Exec(sql, ids).Error
+	return
+}